Tao Bao
d9237d27ea
Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e am: 6bfe76e
...
am: 187e7c7
* commit '187e7c7ab027af90409371fd08386e6d1c2eac3b':
updater: Don't zero out CommandParameters with memset(3).
Change-Id: I0e894b103a5c1a43a24177707fc1190764c1ea45
2016-04-28 04:45:05 +00:00
Tao Bao
187e7c7ab0
Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee am: 4458d3e
...
am: 6bfe76e
* commit '6bfe76e1fefa7fd4c8f1accb9d8959e382ba7bae':
updater: Don't zero out CommandParameters with memset(3).
Change-Id: I057454ed02d17b3fec2fbb4a653b4aedeeee2a43
2016-04-28 04:42:11 +00:00
Tao Bao
6bfe76e1fe
Merge "updater: Don\'t zero out CommandParameters with memset(3)." am: df59cee
...
am: 4458d3e
* commit '4458d3e552736facb7b9cd832744d8d47325b4a3':
updater: Don't zero out CommandParameters with memset(3).
Change-Id: Icc996f7c038a1eb9f861108fffc55e552aa0c42c
2016-04-28 04:39:12 +00:00
Tao Bao
4458d3e552
Merge "updater: Don\'t zero out CommandParameters with memset(3)."
...
am: df59cee
* commit 'df59ceecfb939c02593425a89757b54c50cc91cf':
updater: Don't zero out CommandParameters with memset(3).
Change-Id: I36d1395257da1d122e76f8552bb3a2a8f96f60b7
2016-04-28 04:36:12 +00:00
Tao Bao
df59ceecfb
Merge "updater: Don't zero out CommandParameters with memset(3)."
2016-04-28 04:28:19 +00:00
TreeHugger Robot
c1bd57adfe
Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp
...
am: 3a6c28f
* commit '3a6c28f1f810d84bfec6e195502717647c174a76':
Change-Id: I89d3dbcf1b6baee2de93cc62d4fe13a94b3bca82
2016-04-28 02:46:14 +00:00
Elliott Hughes
b554a2b143
Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: a7f7e70
...
am: ed5b648
* commit 'ed5b648c0e669e4c81a70868a545bb0ecc75cf0c':
Improve the layout-related comments.
Change-Id: I937a622a733f749daa6159bad467e350697661cc
2016-04-28 02:46:14 +00:00
Android Build Merger (Role)
3a6c28f1f8
Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp
2016-04-28 02:43:43 +00:00
TreeHugger Robot
a8e793b9d4
Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
...
am: 1dc396f
* commit '1dc396f8f4bcadca3c39ea9f4025d669564f171b':
Improve the layout-related comments.
Change-Id: I900676d63fdb55957de1d6a798c1530f2d2e0f12
2016-04-28 02:43:31 +00:00
TreeHugger Robot
ed5b648c0e
Merge "Improve the layout-related comments." into nyc-dev am: 343eb72
...
am: a7f7e70
* commit 'a7f7e7093ea67c3ddda03f52edb440c780d69b0d':
Improve the layout-related comments.
Change-Id: I957cc75b064b1d0be5cee54af7b27f008a7a22a1
2016-04-28 02:43:30 +00:00
Elliott Hughes
a7f7e7093e
Merge "Improve the layout-related comments." into nyc-dev
...
am: 343eb72
* commit '343eb722ddd0146e5c752419b3ff9537cfa2d31d':
Improve the layout-related comments.
Change-Id: Ia765c16883d92c6a00846413e8ada372952e8cbf
2016-04-28 02:40:39 +00:00
Elliott Hughes
1dc396f8f4
Merge "Improve the layout-related comments." into nyc-dev
...
am: 343eb72
* commit '343eb722ddd0146e5c752419b3ff9537cfa2d31d':
Improve the layout-related comments.
Change-Id: Ib4ff24016ae056a61e755cd953739418035cd8e9
2016-04-28 02:40:39 +00:00
TreeHugger Robot
343eb722dd
Merge "Improve the layout-related comments." into nyc-dev
2016-04-28 02:36:12 +00:00
Tianjie Xu
61237a552f
Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: e890e19
...
am: 43a4bb0
* commit '43a4bb0ba05f9b259609b4f9d4c9f101c43ee0da':
Change-Id: Idda504b2513690388f8cc79d4b67dbe1eaa4dfb5
2016-04-28 02:14:19 +00:00
Elliott Hughes
14e9137327
Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 21092a9
...
am: b6faf00
* commit 'b6faf00b9b32dcc0a4d36a2addb7e3d6fedf35db':
Change-Id: I459448944a775e8bb313aa31fe61bc61213b847d
2016-04-28 02:14:18 +00:00
Tianjie Xu
43a4bb0ba0
Merge "Update background text for recovery UI" into nyc-dev am: eeca191
...
am: e890e19
* commit 'e890e194d7861307722a39b8689894ce600be2cb':
Change-Id: Ib4869307f14f836ebe6066d4e406c46ac0193de6
2016-04-28 02:11:28 +00:00
Elliott Hughes
b6faf00b9b
Merge "Update recovery UI." into nyc-dev am: 2f1eedd
...
am: 21092a9
* commit '21092a98235d98f431c88ac5f4369ab1ccf0ae9f':
Change-Id: I045e0c51a42c6026c9dfe7c7bb4ddc20479ccd8f
2016-04-28 02:11:27 +00:00
Tianjie Xu
94565fd5f9
Merge "Update background text for recovery UI" into nyc-dev am: eeca191 am: d57691e
...
am: 960691a
* commit '960691a34fe2671a0cc654220e73fe7067b52677':
Update background text for recovery UI
Change-Id: I18d102d9c93abe094fedb799abdf5fa00ad3e613
2016-04-28 01:31:51 +00:00
Elliott Hughes
21a97f2aa0
Merge "Update recovery UI." into nyc-dev am: 2f1eedd am: 75191f3
...
am: 3b13de8
* commit '3b13de8c9cd7f30cf3bc0ff0ff3ec44173386718':
Update recovery UI.
Change-Id: Ibbf3114ea8279f91b9fe02fc9d3494cdbf8d513a
2016-04-28 01:31:50 +00:00
Tianjie Xu
960691a34f
Merge "Update background text for recovery UI" into nyc-dev am: eeca191
...
am: d57691e
* commit 'd57691e094ad6760864fba19fbbeb3805391b950':
Update background text for recovery UI
Change-Id: Id296d644207fa5aa86c058c90cd52b1500ee4250
2016-04-28 01:01:41 +00:00
Tianjie Xu
d57691e094
Merge "Update background text for recovery UI" into nyc-dev
...
am: eeca191
* commit 'eeca191f383d1fda6b1153cf4f443cafff7d7328':
Update background text for recovery UI
Change-Id: I8b959e81da42baa1e95813bf6cab9a2fe374bb11
2016-04-28 00:58:33 +00:00
Tianjie Xu
e890e194d7
Merge "Update background text for recovery UI" into nyc-dev
...
am: eeca191
* commit 'eeca191f383d1fda6b1153cf4f443cafff7d7328':
Update background text for recovery UI
Change-Id: Iacdeece3cee076f1cbb084e4886c3a412f7af9b9
2016-04-28 00:58:33 +00:00
Tianjie Xu
eeca191f38
Merge "Update background text for recovery UI" into nyc-dev
2016-04-28 00:48:32 +00:00
Elliott Hughes
3b13de8c9c
Merge "Update recovery UI." into nyc-dev am: 2f1eedd
...
am: 75191f3
* commit '75191f32a56db352722ab9ac1acf9ceb08485a04':
Update recovery UI.
Change-Id: I190b15530558a9d18fbe7202893bb7a76c5d3ff5
2016-04-28 00:47:09 +00:00
Elliott Hughes
21092a9823
Merge "Update recovery UI." into nyc-dev
...
am: 2f1eedd
* commit '2f1eedded83eea1956ee8b4d391000584588f094':
Update recovery UI.
Change-Id: Ib43b37f60902b13d1fc4110ad5b394c3c3b39332
2016-04-28 00:44:24 +00:00
Elliott Hughes
75191f32a5
Merge "Update recovery UI." into nyc-dev
...
am: 2f1eedd
* commit '2f1eedded83eea1956ee8b4d391000584588f094':
Update recovery UI.
Change-Id: I881497ab669ef7e105a208c4c17062e6dc321380
2016-04-28 00:44:24 +00:00
Elliott Hughes
a369104971
Improve the layout-related comments.
...
Bug: http://b/26548285
Change-Id: I20ae75c4ec2dc64b982a047dba498ebda029c90d
2016-04-27 17:40:11 -07:00
Elliott Hughes
2f1eedded8
Merge "Update recovery UI." into nyc-dev
2016-04-28 00:31:21 +00:00
Baligh Uddin
000c87a22e
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: a42bca8 -s ours
...
am: 158c390 -s ours
* commit '158c39011d2e10a72e6517228ce7e93dd1e54b23':
Change-Id: I1c361d14fe1b4742a4d925449d8ea88bb08aead3
2016-04-27 22:46:26 +00:00
Baligh Uddin
e8d18f8f3d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours am: 06be362 -s ours
...
am: 42e6053 -s ours
* commit '42e6053970f00453277ba876b04b34b1e12869ef':
Import translations. DO NOT MERGE
Change-Id: I363140feb843e1e5533cfb9caa8a6275c73b137a
2016-04-27 22:46:26 +00:00
Baligh Uddin
a2d3081a16
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: abd0988 -s ours
...
am: da5daab -s ours
* commit 'da5daabcae0479788d0a88f0a1e12235b72fb0a6':
Import translations. DO NOT MERGE
Change-Id: I39033afe48c2394760f7140957b05bb7a29f78e8
2016-04-27 22:46:26 +00:00
Tianjie Xu
a15708f45b
Update background text for recovery UI
...
Pull in new translations and regenerate the background strings for
recovery UI.
Bug:27837319
Bug:26548285
Change-Id: I274938a5039421b947878da82336443e9647df24
2016-04-27 15:30:54 -07:00
Baligh Uddin
158c39011d
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours
...
am: a42bca8 -s ours
* commit 'a42bca855509b3360cdf42a1f5677682d1d074b6':
Change-Id: I80a1b3a9693ce901bd3c0cf1149a562b8addeedb
2016-04-27 22:25:25 +00:00
Baligh Uddin
42e6053970
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899 -s ours
...
am: 06be362 -s ours
* commit '06be362ec79fb26658c3afca710c7d11df5f23de':
Import translations. DO NOT MERGE
Change-Id: Idd0e7153210df855be92d788c6a0d90222f69826
2016-04-27 22:17:29 +00:00
Baligh Uddin
06be362ec7
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 47a7899 -s ours
* commit '47a78999ea8719359bf704db3bbe96db214d51fd':
Import translations. DO NOT MERGE
Change-Id: Ica60c273aaf6466250078ee0051278060a0aa650
2016-04-27 22:04:19 +00:00
Baligh Uddin
a42bca8555
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 47a7899 -s ours
* commit '47a78999ea8719359bf704db3bbe96db214d51fd':
Import translations. DO NOT MERGE
Change-Id: If34b4be21c2bb75300c5aaf9fd1ef03a22a5f001
2016-04-27 22:04:19 +00:00
Elliott Hughes
faf36e04ed
Update recovery UI.
...
* Use new animation.
* Use new non-holo progress bars.
* Use recommended spacing for recovery UI.
Bug: http://b/26548285
Change-Id: I8411e89d6a6a9ce638b8645e19e5082d0d968cee
2016-04-27 14:46:01 -07:00
Baligh Uddin
da5daabcae
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: abd0988 -s ours
* commit 'abd098801198a696914e4d2ccaae95ed9fa3f944':
Import translations. DO NOT MERGE
Change-Id: Ib7ea003744e6691aacdb365126784e50d5eaf2a4
2016-04-27 21:42:29 +00:00
Baligh Uddin
3025166f1a
Merge "Import translations. DO NOT MERGE"
2016-04-27 21:18:07 +00:00
Baligh Uddin
47a78999ea
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-04-27 21:18:01 +00:00
Baligh Uddin
abd0988011
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-04-27 21:17:58 +00:00
Bill Yi
0e652e5c02
Import translations. DO NOT MERGE am: ca5003e -s ours am: 97ee2b1 -s ours
...
am: f1d2140 -s ours
* commit 'f1d2140d1a4803257b78537ed0735dc540089669':
Change-Id: Ib205726a79bf6f8a5b37f98bac5a1f54afbabcdc
2016-04-27 00:55:08 +00:00
Bill Yi
d575e7210a
Import translations. DO NOT MERGE am: ca5003e -s ours am: e84e73a -s ours
...
am: 0bc96a7 -s ours
* commit '0bc96a736a1a8392f8a8bccd12c14bbf78b8f784':
Import translations. DO NOT MERGE
Change-Id: I6c61e5ca179a1598ee2f630c87dc5caef87f6047
2016-04-27 00:55:07 +00:00
Tao Bao
730646199b
updater: Don't zero out CommandParameters with memset(3).
...
[1] switched a few things to android::base::unique_fd including
CommandParameters.fd. However, we were using memset(3) to zero out the
struct, which effectively assigned unique_fd(0) to fd. When it called
fd.reset(), file descriptor 0 was unintentionally closed. When FD 0 was
later reassigned via open(2), it led to lseek(2) errors: "Bad file
descriptor".
This CL switches to using braced-init (i.e. '= {}') instead, so that the
default constructor unique_fd(-1) would be called.
[1]: commit bcabd09293
Bug: 28391985
Change-Id: If1f99932b15552714c399e65c8b80550344b758a
2016-04-26 17:36:13 -07:00
Bill Yi
f1d2140d1a
Import translations. DO NOT MERGE am: ca5003e -s ours
...
am: 97ee2b1 -s ours
* commit '97ee2b1fbec2735bc54877f907447e0047aa07b6':
Change-Id: I22fda6dc0d92828b8331dbac473264d0f2295b0c
2016-04-26 23:26:01 +00:00
Bill Yi
0bc96a736a
Import translations. DO NOT MERGE am: ca5003e -s ours
...
am: e84e73a -s ours
* commit 'e84e73a0187027e559871ae72e33bce8986c2be8':
Import translations. DO NOT MERGE
Change-Id: Id7c1a715d5dd776cb41bdd52f8097159670a6b63
2016-04-26 23:22:42 +00:00
Bill Yi
c3b38d1374
Import translations. DO NOT MERGE am: a004356 -s ours
...
am: c9890bf -s ours
* commit 'c9890bf5b2a712f43bc7dd26410ceb09d680ff17':
Import translations. DO NOT MERGE
Change-Id: I2202b7ea61f4f67ebe557049fe64514211ce4a69
2016-04-26 23:19:04 +00:00
Bill Yi
97ee2b1fbe
Import translations. DO NOT MERGE
...
am: ca5003e -s ours
* commit 'ca5003e0336ebe4b8260172ed8183c5ae9095018':
Import translations. DO NOT MERGE
Change-Id: I0a499ffbafa52d0bc9f2a4654ea250c9fa0263ed
2016-04-26 22:52:09 +00:00
Bill Yi
e84e73a018
Import translations. DO NOT MERGE
...
am: ca5003e -s ours
* commit 'ca5003e0336ebe4b8260172ed8183c5ae9095018':
Import translations. DO NOT MERGE
Change-Id: I51c2cfd99a9c6d25cd3da1344229dba7885cc101
2016-04-26 22:48:43 +00:00
Bill Yi
c9890bf5b2
Import translations. DO NOT MERGE
...
am: a004356 -s ours
* commit 'a00435652a8f922cd09cef1ef38fa39c93c3f2c4':
Import translations. DO NOT MERGE
Change-Id: I819d91029945fb4594d9b9e84b5a43e06c2bbb71
2016-04-26 22:17:05 +00:00