Tao Bao
5f877b01b0
Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71 am: 421d92707d
...
am: 81bffbda89
Change-Id: If10fa9ea7cc0254c3b38eb29c5c309ae761d53f4
2017-01-14 15:46:41 +00:00
Tao Bao
81bffbda89
Merge "recovery: Move property_get() to android::base::GetProperty()." am: ebb4e96a71
...
am: 421d92707d
Change-Id: I4f87ad321fba45f98f7adfd12937bf484025873e
2017-01-14 15:43:10 +00:00
Tao Bao
421d92707d
Merge "recovery: Move property_get() to android::base::GetProperty()."
...
am: ebb4e96a71
Change-Id: I248ed1d7e9099c5e89a758fb8d36fa5e13ab538c
2017-01-14 15:40:10 +00:00
Tao Bao
ebb4e96a71
Merge "recovery: Move property_get() to android::base::GetProperty()."
2017-01-14 15:37:01 +00:00
Tianjie Xu
86a820cb42
Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8 am: e05674f93e
...
am: f92c313723
Change-Id: I36ab3a5d46758ef45854efd16dcf8285166d1dc4
2017-01-13 23:13:38 +00:00
Tianjie Xu
f92c313723
Merge "Update background text images in recovery" am: f0af02fea6 am: 19e4f627d8
...
am: e05674f93e
Change-Id: I8ea1c6c8785b7810971de14a0ea61f727ffef765
2017-01-13 23:11:07 +00:00
Tianjie Xu
e05674f93e
Merge "Update background text images in recovery" am: f0af02fea6
...
am: 19e4f627d8
Change-Id: Ic16111cc970780090827f3e2851e4df874a5d8cf
2017-01-13 23:09:07 +00:00
Tianjie Xu
19e4f627d8
Merge "Update background text images in recovery"
...
am: f0af02fea6
Change-Id: I9d287b5d0f5e7b93f77c8c5ea966e800a06a8178
2017-01-13 23:06:36 +00:00
Tianjie Xu
f0af02fea6
Merge "Update background text images in recovery"
2017-01-13 23:02:17 +00:00
Tao Bao
efc35594dd
recovery: Move property_get() to android::base::GetProperty().
...
Test: Apply two A/B incremental OTAs with the new recovery image. The
one with incorrect pre-build should be blocked, while the other
works fine.
Change-Id: I94d97eb8798599da1630f66343fb603e87464187
2017-01-13 12:08:34 -08:00
Roozbeh Pournader
9b85a44355
Merge "Rename language+country resources to just language"
2017-01-13 20:08:16 +00:00
Alex Deymo
9d33dac7f1
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850 am: a1e336d548
...
am: a6adbefa2c
Change-Id: Ife8bfd65d7d439fab60cd462fa272912a6fd99bf
2017-01-12 22:48:17 +00:00
Alex Deymo
866e72bf99
Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a am: 9e93a79f4c
...
am: 3cbb199e24
Change-Id: Ia2447e399bd979402b535e8d7228ab0dad106d78
2017-01-12 22:45:28 +00:00
Alex Deymo
f906d2ba70
Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899 am: 9edd655f94
...
am: 68b7f08b96
Change-Id: Ia98ed0b8e0d50c2256dcacb1a5240e98c68f4adb
2017-01-12 22:45:25 +00:00
Alex Deymo
a6adbefa2c
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb am: f8f1a25850
...
am: a1e336d548
Change-Id: Ic444b595aba05ccbd4eee3f92c4739fbd7c277fa
2017-01-12 21:40:10 +00:00
Alex Deymo
3cbb199e24
Remove "_static" suffix from libsparse am: 67f3aa8804 am: 204369ef1a
...
am: 9e93a79f4c
Change-Id: Ic1f49f4d225086fa7d7a810a6ba4c736ff319e3e
2017-01-12 21:37:38 +00:00
Alex Deymo
68b7f08b96
Remove "_static" suffix from libext4_utils. am: 31653660ad am: 4b54093899
...
am: 9edd655f94
Change-Id: I6191d76d293d4b14e34eaafa227429999707e460
2017-01-12 21:37:36 +00:00
Alex Deymo
a1e336d548
Merge changes from topic 'host_suffix_cleanup' am: 8031c2d2bb
...
am: f8f1a25850
Change-Id: I8b112d02b4a718ff258585e84fa4dfb3ba62dddc
2017-01-12 21:35:11 +00:00
Alex Deymo
9e93a79f4c
Remove "_static" suffix from libsparse am: 67f3aa8804
...
am: 204369ef1a
Change-Id: I614ac38fae44e6cee4a9c2abc35574e6041dc303
2017-01-12 21:32:38 +00:00
Alex Deymo
9edd655f94
Remove "_static" suffix from libext4_utils. am: 31653660ad
...
am: 4b54093899
Change-Id: Iec132548bf78f7c076217bda4e7f24b7acf35f33
2017-01-12 21:32:36 +00:00
Alex Deymo
f8f1a25850
Merge changes from topic 'host_suffix_cleanup'
...
am: 8031c2d2bb
Change-Id: Ifcbf0829692fcac31c5246a07994be1ce0f6ba59
2017-01-12 21:32:34 +00:00
Alex Deymo
204369ef1a
Remove "_static" suffix from libsparse
...
am: 67f3aa8804
Change-Id: Id40f2a7335fed5b0669a98eaa0815b129e35432d
2017-01-12 21:27:38 +00:00
Alex Deymo
4b54093899
Remove "_static" suffix from libext4_utils.
...
am: 31653660ad
Change-Id: Iae744743d29b3669dd57403a2eb90153e5efbe46
2017-01-12 21:27:37 +00:00
Alex Deymo
8031c2d2bb
Merge changes from topic 'host_suffix_cleanup'
...
* changes:
Remove "_static" suffix from libsparse
Remove "_static" suffix from libext4_utils.
2017-01-12 21:23:10 +00:00
Bill Yi
44034377cb
Import translations. DO NOT MERGE
...
Change-Id: Ie80a9f0a82341c96343024296b555621ed4de347
Auto-generated-cl: translation import
2017-01-12 05:03:56 -08:00
Alex Deymo
67f3aa8804
Remove "_static" suffix from libsparse
...
Bug: 34220783
Change-Id: I358f931f0b29f5bd526e1475180e477e2e90b936
2017-01-11 14:38:30 -08:00
Alex Deymo
31653660ad
Remove "_static" suffix from libext4_utils.
...
Bug: 34220783
Change-Id: I34ccc3b11da0d1b48805967ad75b9ddade569930
2017-01-11 14:02:13 -08:00
Roozbeh Pournader
f23f328513
Rename language+country resources to just language
...
Bug: 26496609
Test: none
Change-Id: I6467c8496478402614fcdb46c5399dfa28162201
2017-01-10 16:22:48 -08:00
Tianjie Xu
5c65825891
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1 am: 7d345f27e7
...
am: 4ab40a064d
Change-Id: Ibfca4384125a264124a2485f0a69d6e0ea4cafab
2017-01-10 19:23:53 +00:00
Tianjie Xu
4ab40a064d
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20 am: 854ef3b9d1
...
am: 7d345f27e7
Change-Id: I9ae05b6590af22e98c7cd31a480b4e4c73b67226
2017-01-10 19:17:55 +00:00
Tianjie Xu
7d345f27e7
Merge "Do not inject I/O fault on a retry" am: 37d74f3e20
...
am: 854ef3b9d1
Change-Id: Ic3939632a16b54c2b77732c48c1ace8105298e2f
2017-01-10 19:12:24 +00:00
Tianjie Xu
854ef3b9d1
Merge "Do not inject I/O fault on a retry"
...
am: 37d74f3e20
Change-Id: Ie34000f89b027b79f4161edc7b53b3dd14e51d6a
2017-01-10 19:07:23 +00:00
Tianjie Xu
37d74f3e20
Merge "Do not inject I/O fault on a retry"
2017-01-10 19:00:15 +00:00
Elliott Hughes
1fe1d8eb05
Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda am: ac431948d3
...
am: d481352f05
Change-Id: I71a3e6c3c365f1941c94569c4d022e402379459f
2017-01-10 01:18:22 +00:00
Elliott Hughes
d481352f05
Merge "Address review comment." am: 77ec0071cf am: 3e003ceeda
...
am: ac431948d3
Change-Id: Ide8ad96300b13f8cc32717c61fdddfebbf2dd04e
2017-01-10 01:13:21 +00:00
Elliott Hughes
ac431948d3
Merge "Address review comment." am: 77ec0071cf
...
am: 3e003ceeda
Change-Id: I3f984543d2724c26f8720a4eaeea177b94cf0068
2017-01-10 01:08:22 +00:00
Elliott Hughes
3e003ceeda
Merge "Address review comment."
...
am: 77ec0071cf
Change-Id: I0b40813d4c40e104ee111c45e13d6f278e6d705c
2017-01-10 01:03:21 +00:00
Elliott Hughes
77ec0071cf
Merge "Address review comment."
2017-01-10 00:55:53 +00:00
Tianjie Xu
4728242070
Do not inject I/O fault on a retry
...
We could inject I/O faults during an OTA update for test purpose. But we
should skip the injection if the update is an retry. Otherwise the
update test will simply keeps failing.
Bug: 34159970
Test: Apply the same package on angler and the update succeeds on the 2nd try.
Change-Id: Id274e5475e3bc8d25d50a8cf61a77d2e32c569d6
2017-01-09 14:51:15 -08:00
Elliott Hughes
9c76d255dd
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8 am: 6ac5db29db
...
am: f6d4b1ec09
Change-Id: Ida79628ed3fc418324f32197c77b2d1db787c0fb
2017-01-09 22:47:29 +00:00
Elliott Hughes
f6d4b1ec09
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32 am: 61728ff4d8
...
am: 6ac5db29db
Change-Id: Iad647704a2fc7d7fcfe7ca4c07eec7c1df7e0e02
2017-01-09 22:43:30 +00:00
Elliott Hughes
6ac5db29db
Merge "Move to .md files for even trivial documentation." am: 2fc1ff3b32
...
am: 61728ff4d8
Change-Id: I24746abcc64ed7fe89cf82fa844c719912a77d21
2017-01-09 22:38:29 +00:00
Elliott Hughes
61728ff4d8
Merge "Move to .md files for even trivial documentation."
...
am: 2fc1ff3b32
Change-Id: Idb55c0fcfa99fef4a584d48e39b63e45bd598bf3
2017-01-09 22:33:31 +00:00
Elliott Hughes
ff8fdc955a
Address review comment.
...
Bug: N/A
Test: N/A
Change-Id: I9467286e57522c6ed640a3599cb678ac10d9e2a4
2017-01-09 14:28:42 -08:00
Elliott Hughes
2fc1ff3b32
Merge "Move to .md files for even trivial documentation."
2017-01-09 22:25:53 +00:00
Tao Bao
e204b1469f
Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c am: b7ce9c5e00
...
am: 931bc0c3d1
Change-Id: I9fc2dca136b91a8b30bea1bbdd8c5e577750f0e8
2017-01-09 21:50:39 +00:00
Tao Bao
931bc0c3d1
Merge "recovery: Fix the argument parsing." am: 33808f16c5 am: fe0a80184c
...
am: b7ce9c5e00
Change-Id: Ia85d957754774a4aa9825754339e8745e4d55663
2017-01-09 21:45:39 +00:00
Tao Bao
b7ce9c5e00
Merge "recovery: Fix the argument parsing." am: 33808f16c5
...
am: fe0a80184c
Change-Id: Id077e40e0fa27fb94fee942e95430eb02c369333
2017-01-09 21:40:39 +00:00
Tao Bao
fe0a80184c
Merge "recovery: Fix the argument parsing."
...
am: 33808f16c5
Change-Id: I9ae6633598262f21cca63f90cd51f6b84e5fead2
2017-01-09 21:35:39 +00:00
Tao Bao
33808f16c5
Merge "recovery: Fix the argument parsing."
2017-01-09 21:28:19 +00:00