Dan Albert
8584fcf677
Revert "Some cleanups to recovery."
...
This reverts commit c0319b60f5 .
Reason for revert: Broke builds.
Change-Id: I82aa880b83de5ae6c36fd7567cb001920559a972
2016-10-27 03:08:08 +00:00
Tao Bao
5b4c017f98
Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 am: 05c68a8775
...
am: aa2e4ddc30
Change-Id: I4c795abf9a8bfd8d59cf2d03af6fdd60f85264dc
2016-10-26 23:47:02 +00:00
Tao Bao
aa2e4ddc30
Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23
...
am: 05c68a8775
Change-Id: Id4a669bfce4f12a25ed78919d61de8c16a12fd27
2016-10-26 23:42:01 +00:00
Tao Bao
05c68a8775
Merge "Some cleanups to recovery." am: 46fb0a6a6f
...
am: 00f893fe23
Change-Id: Iea4884c8ea12f8edfdd7e39e8ec6e4cfff26f3a5
2016-10-26 23:37:01 +00:00
Tao Bao
00f893fe23
Merge "Some cleanups to recovery."
...
am: 46fb0a6a6f
Change-Id: Ic247a408b1bd3e2eab1db34eb4b14423d9fd16d6
2016-10-26 23:32:30 +00:00
Treehugger Robot
46fb0a6a6f
Merge "Some cleanups to recovery."
2016-10-26 23:26:04 +00:00
Tao Bao
c0319b60f5
Some cleanups to recovery.
...
- Remove the duplicate gCurrentUI variable in recovery.cpp;
- Refactor the load/save of locale functions;
- Clean up ui_print() to get rid of 256-byte buffer limit;
- Declare ui in common.h;
- Move the typedef of Volume into roots.h.
Test: Build and boot into recovery image.
Change-Id: Ia28c116858ca754133127a5ff9c722af67ad55b7
2016-10-26 14:36:42 -07:00
Tao Bao
cf2d15ae73
Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 am: 74851d8191
...
am: 408edfafc5
Change-Id: I6d90c9822cf1ac5c440ab703c476b6b3bab42610
2016-10-26 16:29:35 +00:00
Tao Bao
408edfafc5
Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305
...
am: 74851d8191
Change-Id: I2f0e2871182541bc64879b86abfcb98306b9c35e
2016-10-26 16:25:04 +00:00
Tao Bao
74851d8191
Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2
...
am: 750bb46305
Change-Id: I619c61797e4a37419daa6b9e03c61b12e1c502cc
2016-10-26 16:20:34 +00:00
Tao Bao
750bb46305
Merge "Skip update-on-boot for bootreason in blacklist"
...
am: ebc141dff2
Change-Id: Ia87fd539f6e18cea47fb3aeec6434f5b25da0eb0
2016-10-26 16:16:04 +00:00
Tao Bao
ebc141dff2
Merge "Skip update-on-boot for bootreason in blacklist"
2016-10-26 16:08:40 +00:00
Tianjie Xu
06e57acf35
Skip update-on-boot for bootreason in blacklist
...
Skip the OTA installation when bootreason is 'kernel_panic',
'Panic' etc.
Change-Id: Ic1202492bffefa1a9d8d0e691b5af979285e552c
Test: On angler, ota installation skips for one bootreason in the blacklist.
Bug: 29978689
(cherry picked from commit 27b9fc8a36 )
2016-10-25 22:32:19 -07:00
Tao Bao
eb9905b851
Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246
...
am: 86487d6855
Change-Id: If5ee190b0a1bc65bc048fadf77346405452adedf
2016-10-26 00:07:09 +00:00
Tao Bao
86487d6855
Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db
...
am: ab526b1246
Change-Id: I5ce8de6c1bb15f30570428ee106b83356ef3bd90
2016-10-26 00:02:08 +00:00
Tao Bao
ab526b1246
Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc
...
am: 8f9672c0db
Change-Id: I4d7dc8bf4a2bda409d02bfa458d365668f3f1576
2016-10-25 23:58:08 +00:00
Tao Bao
8f9672c0db
Merge "tests: Generate testdata for 2nd arch."
...
am: 16e88679dc
Change-Id: I9804a4fe55aa9eb1002d279bb2dc286a0409782d
2016-10-25 23:54:07 +00:00
Tao Bao
16e88679dc
Merge "tests: Generate testdata for 2nd arch."
2016-10-25 23:48:45 +00:00
Tao Bao
f1338fbf41
tests: Generate testdata for 2nd arch.
...
We currently only copy the testdata to
$(TARGET_OUT_DATA_NATIVE_TESTS)/recovery, which fails the tests
generated for 2nd arch (TARGET_2ND_ARCH). For example, on angler
/data/nativetest/recovery_component_test/recovery_component_test fails
due to missing testdata.
Bug: 32123241
Test: Both of /data/nativetest/recovery... and /data/nativetest64/recovery...
work on angler.
Change-Id: Ib76264b4408d01c08b2619c8ac84b2476ea5a8bc
2016-10-25 15:12:13 -07:00
Andriy Naborskyy
195ff7f79e
DO NOT MERGE ANYWHERE init: move healthd to late-init
...
Starting healthd in early-init can cause SELinux denials if healthd
or any device-specific libraries try to log.
Now healthd is starting at boot as usual service.
Bug: 30292927
Change-Id: I367d022f5885122da49181db3db536012e83f564
2016-10-25 19:49:57 +00:00
Tao Bao
ba53452938
Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e am: 6d9f8993b0
...
am: 776651cc5b
Change-Id: I73d5e1ad85a7850a7ceebe2a62ba1f2824591bfc
2016-10-25 02:59:55 +00:00
Tao Bao
776651cc5b
Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba am: 565273839e
...
am: 6d9f8993b0
Change-Id: I900afd26eb8767ce4a8f2362b6674af8d4a7f212
2016-10-25 02:56:24 +00:00
Tao Bao
6d9f8993b0
Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba
...
am: 565273839e
Change-Id: I1c235a75e711a9859831cab9b311ea3304ee8e61
2016-10-25 02:52:55 +00:00
Tao Bao
565273839e
Merge "applypatch: Fix the bug when constructing VAL_BLOB."
...
am: e1991428ba
Change-Id: I354b9535077cf4dfbda78c731ac41cba015e8805
2016-10-25 02:48:54 +00:00
Tao Bao
e1991428ba
Merge "applypatch: Fix the bug when constructing VAL_BLOB."
2016-10-25 02:44:10 +00:00
Tao Bao
edf1b15fef
applypatch: Fix the bug when constructing VAL_BLOB.
...
When constructing std::string from C-string, the string may be truncated
at null char. Use range constructor instead.
Bug: 32380016
Test: Use applypatch to install a previously failed recovery image.
Change-Id: Id3e2afb4a810594243cd21db526933d1fea5044b
2016-10-24 16:08:28 -07:00
Damien Bargiacchi
806c96a0ac
Shrink all recovery loop images with zopflipng am: 2f2c723d1b
...
am: 5e0b587896
Change-Id: I400322d293037a3bdf15c7389621f553c26113eb
2016-10-20 18:28:29 +00:00
Damien Bargiacchi
5e0b587896
Shrink all recovery loop images with zopflipng
...
am: 2f2c723d1b
Change-Id: I1f7e0a91ba39841a7ea26161191178593ff944d0
2016-10-20 18:20:27 +00:00
Damien Bargiacchi
2f2c723d1b
Shrink all recovery loop images with zopflipng
...
Reduces recovery image size 800k - 2.8MB depending on device type
Change-Id: Ib703c8f17394759fb9bad068525737188a4e8965
2016-10-19 19:19:15 -07:00
Yabin Cui
f953fac0e0
Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3 am: a866b12c2d
...
am: 1d4e798e76
Change-Id: Ie6ea0b8d85d64dcbc90b5fad84a02a0637e47607
2016-10-19 19:38:09 +00:00
Yabin Cui
1d4e798e76
Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3
...
am: a866b12c2d
Change-Id: Ibf6f8ef6353a84eef8fc6f79c0b62757b90c6c29
2016-10-19 19:30:38 +00:00
Yabin Cui
a866b12c2d
Merge "Verify wipe package when wiping A/B device in recovery."
...
am: fd796317c3
Change-Id: Iac90d4e641c171e5134ebba5e33556713c7aa4d7
2016-10-19 19:23:07 +00:00
Treehugger Robot
fd796317c3
Merge "Verify wipe package when wiping A/B device in recovery."
2016-10-19 19:15:06 +00:00
Yabin Cui
fd99a318fe
Verify wipe package when wiping A/B device in recovery.
...
To increase the security of wiping A/B devices, let uncrypt write
wipe package in misc partition. Then recovery verifies the wipe
package before wiping the device.
Based on the original cherrypick, this CL also has additional changes to
address the LOG statements and libziparchive changes.
Bug: 29159185
Test: Build and boot into recovery.
Change-Id: I186691bab1928d3dc036bc5542abd64a81bc2168
(cherry picked from commit 6faf0265c9 )
2016-10-19 11:19:15 -07:00
Tianjie Xu
3e645a9b8b
Merge "Add a unit test for applypatch_check" am: 06603c76c5 am: d7d7f3c792
...
am: 54278f4047
Change-Id: I0c1f06c2521305283514c9a199d5d715b1813edb
2016-10-19 03:35:13 +00:00
Tianjie Xu
54278f4047
Merge "Add a unit test for applypatch_check" am: 06603c76c5
...
am: d7d7f3c792
Change-Id: I91189e4dfbb05d2b98ce3eab0f147949cce6c4c9
2016-10-19 03:27:13 +00:00
Tianjie Xu
d7d7f3c792
Merge "Add a unit test for applypatch_check"
...
am: 06603c76c5
Change-Id: Ieb8dd72e88d01d2067ba35369791d038260a4d49
2016-10-19 03:19:12 +00:00
Tianjie Xu
1889b1bb68
Merge "Clean up bootloader_message usage in recovery" am: 94f4494613 am: 7691800c2e
...
am: 0ddd07b0bd
Change-Id: I2a58c6a62e79e2d1fce00281755b34610489b474
2016-10-19 03:11:11 +00:00
Treehugger Robot
06603c76c5
Merge "Add a unit test for applypatch_check"
2016-10-19 03:09:25 +00:00
Tianjie Xu
0ddd07b0bd
Merge "Clean up bootloader_message usage in recovery" am: 94f4494613
...
am: 7691800c2e
Change-Id: I4ef47383d9da3a6aef72fdb689e2aa2cfbeeb963
2016-10-19 03:02:41 +00:00
Tianjie Xu
7691800c2e
Merge "Clean up bootloader_message usage in recovery"
...
am: 94f4494613
Change-Id: Idda16fe41dc644ef12fe12706e5d61b8c3a9fa62
2016-10-19 02:55:10 +00:00
Treehugger Robot
94f4494613
Merge "Clean up bootloader_message usage in recovery"
2016-10-19 02:48:02 +00:00
Tianjie Xu
4e8d032183
Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37 am: ece0b68ca6
...
am: 502e34c301
Change-Id: I64648714a96a2d9b734441c15557eb2b1f268f69
2016-10-19 00:55:33 +00:00
Tianjie Xu
bd56f1590c
Clean up bootloader_message usage in recovery
...
Switch to using vector and string.
Test: bootloader message writes correctly on angler.
Change-Id: I95d5a1e584630db326bb4400f3a149b59ad30a9e
2016-10-19 00:50:56 +00:00
Tianjie Xu
502e34c301
Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37
...
am: ece0b68ca6
Change-Id: I94f84db1cc053fa583adefc2ea69b3d4c0547de4
2016-10-19 00:48:02 +00:00
Tianjie Xu
ece0b68ca6
Merge "Fix applypatch_check failure when applying update on angler"
...
am: 7df1850d37
Change-Id: I5d5509d15df4ec42077b68bac7977b56cfab9097
2016-10-19 00:42:01 +00:00
Tianjie Xu
a5fd5abe80
Add a unit test for applypatch_check
...
If no sha1 is specified, applypatch_check should pass as long as
the file content loads successfully. Add a unit case acccordingly.
Test: Unit tests passed
Bug: 32243751
Change-Id: I8c013be67c197d2935e11cf6acc59fb9b943cfd9
2016-10-18 17:30:38 -07:00
Tianjie Xu
7df1850d37
Merge "Fix applypatch_check failure when applying update on angler"
2016-10-19 00:29:23 +00:00
Yabin Cui
c8a872ce44
Merge "Fix bootloader_message." am: 7c95fe10de am: 83e4e6d35c
...
am: f258f601a0
Change-Id: I72376cae20beeae2ee4aa13f6d28f5a61ffdce49
2016-10-18 23:50:29 +00:00
Yabin Cui
f258f601a0
Merge "Fix bootloader_message." am: 7c95fe10de
...
am: 83e4e6d35c
Change-Id: I2e3986837c7a1daaa6fa4a8c1031f619efb8b361
2016-10-18 23:43:29 +00:00