0b6085a341
Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c
...
am: 88fc75ee54
2016-11-02 00:03:36 +00:00
88fc75ee54
Merge "Cleanup ReadArgs & ReadValueArgs usage"
...
am: a9b252887c
2016-11-02 00:01:05 +00:00
a9b252887c
Merge "Cleanup ReadArgs & ReadValueArgs usage"
2016-11-01 23:53:02 +00:00
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
edf2928edf
Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef
...
am: bc48de6bf0
2016-11-01 21:32:50 +00:00
bc48de6bf0
Merge "applypatch: Switch the parameter of Value** to std::vector."
...
am: 3f4030e0ef
2016-11-01 21:30:20 +00:00
3f4030e0ef
Merge "applypatch: Switch the parameter of Value** to std::vector."
2016-11-01 21:25:12 +00:00
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
3456ee19f9
Merge "Revert "Some cleanups to recovery."" am: 9514eb1934
...
am: 0c571e5923
2016-10-27 04:58:20 +00:00
0c571e5923
Merge "Revert "Some cleanups to recovery.""
...
am: 9514eb1934
2016-10-27 04:53:48 +00:00
9514eb1934
Merge "Revert "Some cleanups to recovery.""
2016-10-27 04:49:49 +00:00
8584fcf677
Revert "Some cleanups to recovery."
...
This reverts commit c0319b60f5
2016-10-27 03:08:08 +00:00
05c68a8775
Merge "Some cleanups to recovery." am: 46fb0a6a6f
...
am: 00f893fe23
2016-10-26 23:37:01 +00:00
00f893fe23
Merge "Some cleanups to recovery."
...
am: 46fb0a6a6f
2016-10-26 23:32:30 +00:00
46fb0a6a6f
Merge "Some cleanups to recovery."
2016-10-26 23:26:04 +00:00
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
74851d8191
Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2
...
am: 750bb46305
2016-10-26 16:20:34 +00:00
750bb46305
Merge "Skip update-on-boot for bootreason in blacklist"
...
am: ebc141dff2
2016-10-26 16:16:04 +00:00
ebc141dff2
Merge "Skip update-on-boot for bootreason in blacklist"
2016-10-26 16:08:40 +00:00
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
ab526b1246
Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc
...
am: 8f9672c0db
2016-10-25 23:58:08 +00:00
8f9672c0db
Merge "tests: Generate testdata for 2nd arch."
...
am: 16e88679dc
2016-10-25 23:54:07 +00:00
16e88679dc
Merge "tests: Generate testdata for 2nd arch."
2016-10-25 23:48:45 +00:00
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
6d9f8993b0
Merge "applypatch: Fix the bug when constructing VAL_BLOB." am: e1991428ba
...
am: 565273839e
2016-10-25 02:52:55 +00:00
565273839e
Merge "applypatch: Fix the bug when constructing VAL_BLOB."
...
am: e1991428ba
2016-10-25 02:48:54 +00:00
e1991428ba
Merge "applypatch: Fix the bug when constructing VAL_BLOB."
2016-10-25 02:44:10 +00:00
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
5e0b587896
Shrink all recovery loop images with zopflipng
...
am: 2f2c723d1b
2016-10-20 18:20:27 +00:00
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
1d4e798e76
Merge "Verify wipe package when wiping A/B device in recovery." am: fd796317c3
...
am: a866b12c2d
2016-10-19 19:30:38 +00:00
a866b12c2d
Merge "Verify wipe package when wiping A/B device in recovery."
...
am: fd796317c3
2016-10-19 19:23:07 +00:00
fd796317c3
Merge "Verify wipe package when wiping A/B device in recovery."
2016-10-19 19:15:06 +00:00
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
54278f4047
Merge "Add a unit test for applypatch_check" am: 06603c76c5
...
am: d7d7f3c792
2016-10-19 03:27:13 +00:00
d7d7f3c792
Merge "Add a unit test for applypatch_check"
...
am: 06603c76c5
2016-10-19 03:19:12 +00:00
06603c76c5
Merge "Add a unit test for applypatch_check"
2016-10-19 03:09:25 +00:00
0ddd07b0bd
Merge "Clean up bootloader_message usage in recovery" am: 94f4494613
...
am: 7691800c2e
2016-10-19 03:02:41 +00:00
7691800c2e
Merge "Clean up bootloader_message usage in recovery"
...
am: 94f4494613
2016-10-19 02:55:10 +00:00
94f4494613
Merge "Clean up bootloader_message usage in recovery"
2016-10-19 02:48:02 +00:00
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
502e34c301
Merge "Fix applypatch_check failure when applying update on angler" am: 7df1850d37
...
am: ece0b68ca6
2016-10-19 00:48:02 +00:00
ece0b68ca6
Merge "Fix applypatch_check failure when applying update on angler"
...
am: 7df1850d37
2016-10-19 00:42:01 +00:00
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
7df1850d37
Merge "Fix applypatch_check failure when applying update on angler"
2016-10-19 00:29:23 +00:00
f258f601a0
Merge "Fix bootloader_message." am: 7c95fe10de
...
am: 83e4e6d35c
2016-10-18 23:43:29 +00:00
83e4e6d35c
Merge "Fix bootloader_message."
...
am: 7c95fe10de
2016-10-18 23:36:28 +00:00
7c95fe10de
Merge "Fix bootloader_message."
2016-10-18 23:23:09 +00:00
2a576e2097
resolve merge conflicts of e89bf25 to stage-aosp-master
...
am: 69c117c2ff
2016-10-18 23:00:55 +00:00
0d5b85944c
Fix bootloader_message.
...
Bug: 29945717
Change-Id: I934fd6c52b0111937fa75455de2fa4157fb30f6f
(cherry picked from commit 9da04d595f
2016-10-18 15:10:59 -07:00
Tianjie Xu
Tao Bao
Dan Albert
Treehugger Robot
Damien Bargiacchi
Yabin Cui