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
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
Tianjie Xu
d7d7f3c792
Merge "Add a unit test for applypatch_check"
...
am: 06603c76c5
Change-Id: Ieb8dd72e88d01d2067ba35369791d038260a4d49
2016-10-19 03:19:12 +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
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
f258f601a0
Merge "Fix bootloader_message." am: 7c95fe10de
...
am: 83e4e6d35c
Change-Id: I2e3986837c7a1daaa6fa4a8c1031f619efb8b361
2016-10-18 23:43:29 +00:00
Yabin Cui
83e4e6d35c
Merge "Fix bootloader_message."
...
am: 7c95fe10de
Change-Id: I102d5b27dcb295e82b7ec094a641a43efca793dc
2016-10-18 23:36:28 +00:00
Treehugger Robot
7c95fe10de
Merge "Fix bootloader_message."
2016-10-18 23:23:09 +00:00
Tao Bao
2a576e2097
resolve merge conflicts of e89bf25 to stage-aosp-master
...
am: 69c117c2ff
Change-Id: I668395a8f8ec5d004755ed39f8b7517be1e3527d
2016-10-18 23:00:55 +00:00
Yabin Cui
0d5b85944c
Fix bootloader_message.
...
Bug: 29945717
Change-Id: I934fd6c52b0111937fa75455de2fa4157fb30f6f
(cherry picked from commit 9da04d595f )
2016-10-18 15:10:59 -07:00
Tao Bao
69c117c2ff
resolve merge conflicts of e89bf25 to stage-aosp-master
...
Change-Id: I3b0ddb23daf264d407370cd8ace31eceb230a11a
2016-10-18 15:08:07 -07:00
Tianjie Xu
434697f06b
resolve merge conflicts of 6fba98c to stage-aosp-master
...
am: 8176cf232e
Change-Id: I01b34cb31604ea5caffe96ad69ab4d4d21bfe28e
2016-10-18 22:05:21 +00:00
Tao Bao
e89bf257a1
Merge "Create bootloader_message static library."
2016-10-18 21:48:23 +00:00
Tianjie Xu
8176cf232e
resolve merge conflicts of 6fba98c to stage-aosp-master
...
Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7
2016-10-18 21:31:04 +00:00
Tianjie Xu
984d7d058e
Fix applypatch_check failure when applying update on angler
...
Applypatch_check should be skipped if no sha is specified. As the
comments said: "It's okay to specify no sha1s; the check will pass if
the LoadFileContents is successful. Useful for reading partitions,
where the filename encodes the sha1s."
Test: The update package applied on angler successfully.
Bug: 32243751
Change-Id: Ib8f3dadf19f745c2dbd350d60da46ab12d75bc87
2016-10-18 21:22:48 +00:00
Yabin Cui
8b309f6970
Create bootloader_message static library.
...
bootloader_messages merges bootloader_message_writer
and bootloader.cpp, so we can use the same library to
manage bootloader_message in normal boot and recovery mode.
Bug: 29582118
Change-Id: I9efdf776ef8f02b53911ff43a518e035e0c29618
(cherry picked from commit 2f272c0551 )
2016-10-18 11:37:05 -07:00
Tianjie Xu
6fba98ce64
Merge "Replace minzip with libziparchive"
2016-10-18 17:30:02 +00:00
Tianjie Xu
8cf5c8f60f
Replace minzip with libziparchive
...
Clean up the duplicated codes that handle the zip files in
bootable/recovery; and rename the library of the remaining
utility functions to libotautil.
Test: Update package installed successfully on angler.
Bug: 19472796
Change-Id: Iea8962fcf3004473cb0322b6bb3a9ea3ca7f679e
2016-10-17 17:41:51 -07:00
Tianjie Xu
13d8ee8c72
Merge "Change StringValue to use std::string" am: 2b17b24ae5
...
am: 430b7ae469
Change-Id: Ife83f67a57629747b9804ca332265344a8350d2a
2016-10-18 00:21:59 +00:00
Tianjie Xu
430b7ae469
Merge "Change StringValue to use std::string"
...
am: 2b17b24ae5
Change-Id: Ie3c7e6993848f53893e9079bb5cffa11d9c2a3f0
2016-10-18 00:15:29 +00:00
Treehugger Robot
2b17b24ae5
Merge "Change StringValue to use std::string"
2016-10-18 00:05:12 +00:00
Tao Bao
f194cb3b99
Merge "init: move healthd to late-init" am: a01ffc73ef
...
am: 4de11bb370
Change-Id: I81b584ea1f60f7495afc85d38b5e91fae4769b98
2016-10-17 17:50:34 +00:00
Tao Bao
4de11bb370
Merge "init: move healthd to late-init"
...
am: a01ffc73ef
Change-Id: Iab786297c3dd19c61b11364d6fb49d52fcf007a4
2016-10-17 17:44:33 +00:00