Tianjie Xu
97ea844aca
resolve build error when merging 0f7f7e21
...
Test: mma
Change-Id: Ibdcf7b47e54d3739fb922f66996365763d2acfef
2017-01-18 15:15:17 -08:00
Tianjie Xu
8a45adb243
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13 am: e4ec60e045
...
am: e0d3b0ceab
Change-Id: I4fe8bdd81f8250b862b0018f0a52a76d37ee9d88
2017-01-18 22:42:19 +00:00
Tianjie Xu
e0d3b0ceab
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a am: 64f0de7a13
...
am: e4ec60e045
Change-Id: If13ea5ee5c963357e73f82c677782d569c745acd
2017-01-18 22:40:19 +00:00
Tianjie Xu
e4ec60e045
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763 am: ca50d7b66a
...
am: 64f0de7a13
Change-Id: I3b67824479c820d06e84e6611e4aff87265dab11
2017-01-18 22:37:48 +00:00
Tianjie Xu
64f0de7a13
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3 am: 15ca2a4763
...
am: ca50d7b66a
Change-Id: Ic6e05b8812f4b765b9114149373c7a00ad9ec78d
2017-01-18 22:36:48 +00:00
Tianjie Xu
ca50d7b66a
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51 am: a055eb93c3
...
am: 15ca2a4763
Change-Id: I5481d39f0d2fdb92c95e964d2a55512f4df3acb3
2017-01-18 22:34:18 +00:00
Tianjie Xu
15ca2a4763
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45 am: 6ea9888d51
...
am: a055eb93c3
Change-Id: I8d26eefd2de6b7245a110c27d4210d5fdd2bd151
2017-01-18 22:32:47 +00:00
Tianjie Xu
a055eb93c3
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d am: d3d5e54a45
...
am: 6ea9888d51
Change-Id: I7bbabdbe543c54f18dd42cb64030ca2174bf9bf2
2017-01-18 22:30:47 +00:00
Tianjie Xu
6ea9888d51
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b am: fb80b4f72d
...
am: d3d5e54a45
Change-Id: Ib892c1745197ccb42d77c7bc8647f2e6b725a7dd
2017-01-18 22:28:46 +00:00
Tianjie Xu
d3d5e54a45
Add a checker for signature boundary in verifier am: 54ea136fde am: 0a34b17c8b
...
am: fb80b4f72d
Change-Id: Iba2da78981e4bd7a2b263b2f6b18ab6c176e5fc8
2017-01-18 22:26:47 +00:00
Tianjie Xu
fb80b4f72d
Add a checker for signature boundary in verifier am: 54ea136fde
...
am: 0a34b17c8b
Change-Id: I4dbba92ea717951307dbcb6bf287edf4f6144a38
2017-01-18 22:24:16 +00:00
Tianjie Xu
0a34b17c8b
Add a checker for signature boundary in verifier
...
am: 54ea136fde
Change-Id: Ide2da96e322c6a913b7f2e950e43c4d11278338e
2017-01-18 22:22:16 +00:00
Tao Bao
54890af615
Merge "minui: Export minui/minui.h." am: 13d15af08f
...
am: ad20b76397
Change-Id: I91b8a72fc334fc69ba4b907d6460c9e8c4e9dd18
2017-01-17 19:14:26 +00:00
Tao Bao
ad20b76397
Merge "minui: Export minui/minui.h."
...
am: 13d15af08f
Change-Id: I12755c0fa6b184e68b49899e1cf589161e24eb62
2017-01-17 19:12:28 +00:00
Tao Bao
13d15af08f
Merge "minui: Export minui/minui.h."
2017-01-17 19:08:48 +00:00
Tao Bao
0ecbd76b22
minui: Export minui/minui.h.
...
For libminui static and shared libraries.
Test: build
Change-Id: Ib30dc5e2ef4a3c8b3ca3a0cec68cb65e229a0c16
2017-01-16 21:28:18 -08: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
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
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
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
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
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
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
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
Tao Bao
570af9dca3
recovery: Fix the argument parsing.
...
Commit f0ed159f48 unintentionally changed
the behavior when parsing the arguments from BCB and command file. It
should only parse the command file for arguments if BCB doesn't supply
any.
As a result, it shows the following from the log:
I:Got 2 arguments from boot message
I:Got 3 arguments from /cache/recovery/command
Test: Set arguments in BCB and command file both. It should only use the
arguments from BCB.
Change-Id: Idf371137aa9177f1b2dfdfecf0c9f46959d2ee76
2017-01-09 10:35:42 -08:00
Elliott Hughes
7a890e5cf5
Move to .md files for even trivial documentation.
...
So it's automatically displayed for folks browsing the source.
Bug: N/A
Test: N/A
Change-Id: Ie9b190072ebdf0faf06cc1fd7b3467c031056753
2017-01-07 12:49:32 -08:00
Tianjie Xu
5ec75851a7
Merge "Retry ioctl in uncrypt if it returns block# 0" am: ceafe69fb8
...
am: 06b4254a70
Change-Id: I09e0b59a433533c84f251a8c32c663a1ca8a8d3b
2017-01-07 01:20:05 +00:00
Tianjie Xu
06b4254a70
Merge "Retry ioctl in uncrypt if it returns block# 0"
...
am: ceafe69fb8
Change-Id: I5fa4c97672520c2ec47e2bbb55b55c5f54417dc7
2017-01-07 01:16:02 +00:00