Tianjie Xu
c81ef65828
Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54
...
am: 0b6085a341
Change-Id: I9b76ca015f94677775cc8dd75b755dd4b226183d
2016-11-02 00:06:35 +00:00
Tianjie Xu
0b6085a341
Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c
...
am: 88fc75ee54
Change-Id: Ie167a4fef7f877c0cb40715aa3bbb95a08e9926d
2016-11-02 00:03:36 +00:00
Tianjie Xu
88fc75ee54
Merge "Cleanup ReadArgs & ReadValueArgs usage"
...
am: a9b252887c
Change-Id: I2bf575fbb14165e7904d01b01b71ec6e3f24f068
2016-11-02 00:01:05 +00:00
Tianjie Xu
a9b252887c
Merge "Cleanup ReadArgs & ReadValueArgs usage"
2016-11-01 23:53:02 +00:00
Tianjie Xu
5fe280ac96
Cleanup ReadArgs & ReadValueArgs usage
...
ReadArgs will switch to using std::string and std::unique_ptr. Also
cleanup the callers.
Test: mma & component test passed.
Change-Id: I4724406ae6c0c134a27bbd1cdd24ad5d343b2a3b
2016-11-01 15:03:06 -07:00
Tao Bao
492bd8ca71
Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0
...
am: edf2928edf
Change-Id: I475d65b39824734260cad5921f02a6eaad80bd4b
2016-11-01 21:35:20 +00:00
Tao Bao
edf2928edf
Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef
...
am: bc48de6bf0
Change-Id: Ibb887acf4d2afe46fbbe1193daddcf73eff3423e
2016-11-01 21:32:50 +00:00
Tao Bao
bc48de6bf0
Merge "applypatch: Switch the parameter of Value** to std::vector."
...
am: 3f4030e0ef
Change-Id: I741638c51e9c3fe57cc874e6af86ea6a65d5aa71
2016-11-01 21:30:20 +00:00
Tao Bao
3f4030e0ef
Merge "applypatch: Switch the parameter of Value** to std::vector."
2016-11-01 21:25:12 +00:00
Tao Bao
fada91ccf2
applypatch: Switch the parameter of Value** to std::vector.
...
Test: Unit tests and install-recovery.sh pass on angler and dragon.
Change-Id: I328e6554edca667cf850f5584ebf1ac211e3d4d1
2016-10-28 16:46:12 -07:00
Andriy Naborskyy
8b1840799e
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours am: 67bc0b9573 -s ours
...
am: 9ab6af5a61 -s ours
Change-Id: Ib10f137a0f23752ebc1d0090f9b90ba22504703b
2016-10-27 16:30:56 +00:00
Andriy Naborskyy
9ab6af5a61
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours am: 3fdf1fd515 -s ours
...
am: 67bc0b9573 -s ours
Change-Id: Id648e49a1e81d7cc22a273fbd209c18ffe1ea0b0
2016-10-27 16:25:56 +00:00
Andriy Naborskyy
67bc0b9573
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours am: 8837b0d25d -s ours
...
am: 3fdf1fd515 -s ours
Change-Id: I8cfd3782a8cac351057b258d44caaa987397201d
2016-10-27 16:21:56 +00:00
Andriy Naborskyy
3fdf1fd515
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours am: b8c1788e7b -s ours
...
am: 8837b0d25d -s ours
Change-Id: I7ecada4bf93f79a8b308064c417e85d4e7f9ecc3
2016-10-27 16:16:55 +00:00
Andriy Naborskyy
8837b0d25d
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours
...
am: b8c1788e7b -s ours
Change-Id: I14de8cfdef94dfcb2d3f0760daf519537fa796d5
2016-10-27 16:11:55 +00:00
Andriy Naborskyy
b8c1788e7b
DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours
...
am: 7ceb371048 -s ours
Change-Id: I5c36f2e8ee5e410e9027376c32e86baa7fa2e65a
2016-10-27 16:07:25 +00:00
Andriy Naborskyy
7ceb371048
DO NOT MERGE ANYWHERE init: move healthd to late-init
...
am: 195ff7f79e -s ours
Change-Id: Ibf16373a783458fd91284254156d5a9a0d70252d
2016-10-27 16:02:24 +00:00
Dan Albert
ec31f732c3
Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923
...
am: 3456ee19f9
Change-Id: Ia3b0e970555a256d0576a2b94c2f6825f279de7c
2016-10-27 05:02:18 +00:00
Dan Albert
3456ee19f9
Merge "Revert "Some cleanups to recovery."" am: 9514eb1934
...
am: 0c571e5923
Change-Id: I1a5b89905f24c2f20250a288345b6dbdea486cc1
2016-10-27 04:58:20 +00:00
Dan Albert
0c571e5923
Merge "Revert "Some cleanups to recovery.""
...
am: 9514eb1934
Change-Id: Id96135ffde5adaebd45811b9c3d319a99fe28ecd
2016-10-27 04:53:48 +00:00
Treehugger Robot
9514eb1934
Merge "Revert "Some cleanups to recovery.""
2016-10-27 04:49:49 +00:00
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
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
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
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
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
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
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
54278f4047
Merge "Add a unit test for applypatch_check" am: 06603c76c5
...
am: d7d7f3c792
Change-Id: I91189e4dfbb05d2b98ce3eab0f147949cce6c4c9
2016-10-19 03:27:13 +00:00