Andriy Naborskyy
59590f325b
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: b7d4d77b3e -s ours
Change-Id: Iae68e9050b51755d1d33ad9834beadc696402d32
2016-11-23 22:52:19 +00:00
Andriy Naborskyy
b7d4d77b3e
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: Id74374ae2d659ebc50a7612c80a81f53abff77f0
2016-11-23 22:45:04 +00:00
Tao Bao
eb718e1c99
DO NOT MERGE updater: Add "write_value()" function.
...
am: 1bf1772625 -s ours
Change-Id: I91141b6af02c5146e41eccf66a6700b44dc8cfb1
2016-11-22 21:10:58 +00:00
Tao Bao
d8e4f12ae0
Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d
...
am: b4aae79230
Change-Id: Ifc6f913352d60e663fa5e1b7547938220167ea67
2016-11-21 19:42:38 +00:00
Tao Bao
b4aae79230
Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407
...
am: 1aa41a106d
Change-Id: I802d7ceb8cd6288d6c85e3faa15c4e2cb57a9865
2016-11-21 19:37:38 +00:00
Tao Bao
1aa41a106d
Merge "applypatch: Release FD when explicitly calling close."
...
am: a511a3c407
Change-Id: Ie4188abf0d9a9dec56ae162f7bd6d1cd35aacb0f
2016-11-21 19:32:37 +00:00
Treehugger Robot
a511a3c407
Merge "applypatch: Release FD when explicitly calling close."
2016-11-21 19:24:09 +00:00
Tao Bao
21a10e2cfa
Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85
...
am: 5713071c81
Change-Id: I881011efc5449f5cedcbe395b82a8d58e024c6da
2016-11-21 19:22:07 +00:00
Tao Bao
5713071c81
Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f
...
am: 2a962adc85
Change-Id: Ifad227336cc3a0db254a9bfef0de2678d8dd86bd
2016-11-21 19:16:37 +00:00
Tao Bao
2a962adc85
Merge "Fail gracefully when we fail to fork the update binary"
...
am: 340a2d364f
Change-Id: If68e5c3b97e01186804076caf516512d8b9977b3
2016-11-21 19:11:35 +00:00
Tao Bao
340a2d364f
Merge "Fail gracefully when we fail to fork the update binary"
2016-11-21 19:06:37 +00:00
Tao Bao
48cf770471
applypatch: Release FD when explicitly calling close.
...
We use android::base::unique_fd() to avoid leaking FD. We also want to
call close (or ota_close) to explicitly check the close result. When
combining the two together, we need to release the unique_fd to avoid
closing the same FD twice.
Bug: 33034669
Test: Trigger applypatch with install-recovery.sh.
Change-Id: I1a4f5d5fba7a23ef98d8bd7b7b07e87ae6f705c5
2016-11-21 09:47:34 -08:00
Matthew Bouyack
10cd48da1d
Fail gracefully when we fail to fork the update binary
...
This change was original made in cw-f-dev but caused failures in
nyc-mr1-dev-plus-aosp due to lack of support for 'LOGE'
This version of the change uses the new 'LOG(ERROR)' style logging
instead.
See bug b/31395655
Test: attempt a memory intensive incremental OTA on a low-memory device
Change-Id: Ia87d989a66b0ce3f48e862abf9b9d6943f70e554
(cherry picked from commit c8db481780 )
2016-11-20 22:38:37 -08:00
Bill Yi
5c11172849
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours
...
am: 92ac9041c1 -s ours
Change-Id: I905cc7cc9acbf5cc97d35cea376c0a5d83fcd335
2016-11-21 01:37:28 +00:00
Bill Yi
e988840a88
Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours
...
am: 8d7399f553 -s ours
Change-Id: I361b0acc015358c220c3288305efb9a3115f2f62
2016-11-21 01:37:15 +00:00
Bill Yi
92ac9041c1
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: cf589f523a -s ours
Change-Id: Ibfec2c461c31264dd31ffddbf938be364056eb50
2016-11-21 01:32:08 +00:00
Bill Yi
8d7399f553
Import translations. DO NOT MERGE
...
am: 9a4ff5a900 -s ours
Change-Id: I19ed28ded9e92d54b060d0a944cf318a0f1a4984
2016-11-21 01:32:08 +00:00
TreeHugger Robot
cf589f523a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-11-21 01:24:53 +00:00
Bill Yi
9a4ff5a900
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: I4d68cd0c69b40d1765cd74dfa730f56be01b5b23
2016-11-20 15:25:37 -08:00
Tao Bao
073408a943
Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b
...
am: 4cbedcc679
Change-Id: I37af5d1ae1be07d6c1b233f5cf25896339db51cd
2016-11-20 18:29:07 +00:00
Tao Bao
4cbedcc679
Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc
...
am: fa62ae6d0b
Change-Id: I516b0a177f66b6a3c1e51b2f470a29c8d2913780
2016-11-20 18:24:07 +00:00
Tao Bao
fa62ae6d0b
Merge "Call update_engine_sideload from recovery."
...
am: 1d77c93bcc
Change-Id: I110237afa38d616138e2ec8eec17b9c46b009a13
2016-11-20 18:19:37 +00:00
Tao Bao
1d77c93bcc
Merge "Call update_engine_sideload from recovery."
2016-11-20 18:13:14 +00:00
Alex Deymo
9b10e6095a
Call update_engine_sideload from recovery.
...
This patch enables sideloading an OTA on A/B devices while running from
recovery. Recovery accepts the same OTA package format as recent
versions of GMS, which consists of .zip file with the payload in it.
Bug: 27178350
TEST=`adb sideload` successfully a full OTA (*)
TEST=Failed to take several invalid payloads (wrong product,
fingerprint, update type, serial, etc).
<small>(*) with no postinstall script.</small>
Change-Id: I951869340100feb5a37e41fac0ee59c10095659e
(cherry picked from commit 4344d636d4 )
2016-11-19 22:39:51 -08:00
Tao Bao
953851cb97
Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e
...
am: 062a2cffb3
Change-Id: I4673e6b160fcf9e2b6069af91eeae97d4e4a17ed
2016-11-20 05:18:19 +00:00
Tao Bao
723b5d505f
Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c
...
am: 9f4d385704
Change-Id: If6d2231e486ba91398ff8bef8d4f118e57c3324d
2016-11-20 05:14:00 +00:00
Tao Bao
062a2cffb3
Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486
...
am: 146f92ab3e
Change-Id: I37b91e4f05ad19bafa464a7e30ff8bf61830763d
2016-11-20 05:13:49 +00:00
Tao Bao
8024278b58
update_verifier: Sync Android.mk with aosp-master. am: 5422d80961
...
am: ca64fa7bb9
Change-Id: I8ddc76d026d64b22fd8cbda8d9a312afd975c54c
2016-11-20 05:13:48 +00:00
Tao Bao
146f92ab3e
Merge "updater: Refactor set_stage() and get_stage() functions."
...
am: c627cd6486
Change-Id: Ie4ff6fa512c875c6be65b02908eadb498d3f9644
2016-11-20 05:09:49 +00:00
Tao Bao
9f4d385704
Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master
...
am: ad57e2ca2c
Change-Id: I5ad7c0763284e32952c9b7953e526ec2d8e1aed9
2016-11-20 05:09:49 +00:00
Tao Bao
ca64fa7bb9
update_verifier: Sync Android.mk with aosp-master.
...
am: 5422d80961
Change-Id: Iac281a5f7a1a771282cdbf4503fe7e0991073624
2016-11-20 05:09:48 +00:00
Tao Bao
ad57e2ca2c
Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master
2016-11-20 05:06:00 +00:00
Tao Bao
c627cd6486
Merge "updater: Refactor set_stage() and get_stage() functions."
2016-11-20 05:04:54 +00:00
Tao Bao
009455b313
bootloader_message: Remove the no-op blank line. am: fbde508ace
...
am: 52b4d869b0
Change-Id: I1586aae053d9c9b503c55e5e1122bb6c37aacc21
2016-11-19 18:19:08 +00:00
Tao Bao
52b4d869b0
bootloader_message: Remove the no-op blank line.
...
am: fbde508ace
Change-Id: Ia3f298ef61fbeed0a80b8d85366ee27358a3320f
2016-11-19 18:15:08 +00:00
Tao Bao
fbde508ace
bootloader_message: Remove the no-op blank line.
...
This single blank line was introduced by some cherry-pick, which is
causing merge conflicts.
Test: N/A
Change-Id: Ida527b76fca7cc916499c5f888476c8e51ba3eaa
2016-11-18 16:00:23 -08:00
Tao Bao
5422d80961
update_verifier: Sync Android.mk with aosp-master.
...
It's out of sync due to the cherry-pick in commit
d007cf2da2 .
Test: mmma bootable/recovery
Change-Id: I286fe89c4c7d09de3a06d09f9a2b0cdecef326f5
2016-11-18 15:10:01 -08:00
Connor O'Brien
7ad875cc81
Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp
...
am: 692e95aa87
Change-Id: Ic30a3fb13abda71cd6317760f41058728ead4cf0
2016-11-18 20:52:13 +00:00
Connor O'Brien
7d17f64275
Revert "Convert update_verifier to boot HIDL HAL"
...
am: 7206ec7a1d
Change-Id: Id9fa374c3f979f39fb32a1d82c9e2d18e38b0efa
2016-11-18 20:52:12 +00:00
Connor O'Brien
692e95aa87
Merge "Revert "Convert update_verifier to boot HIDL HAL"" into nyc-mr1-dev-plus-aosp
2016-11-18 20:48:09 +00:00
Connor O'Brien
1d5bf16cf0
Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours am: 6fd51ffdaa
...
am: b5cf492040
Change-Id: I8aca5c87a0786cc897a4a674f10952a60d816ca3
2016-11-18 20:45:43 +00:00
Connor O'Brien
b5cf492040
Merge "Revert "Convert update_verifier to boot HIDL HAL"" am: fc6e8cae9c -s ours
...
am: 6fd51ffdaa
Change-Id: I5db9f43be5c7fb6375dc8f0b1964796112a7eef1
2016-11-18 20:42:41 +00:00
Connor O'Brien
6fd51ffdaa
Merge "Revert "Convert update_verifier to boot HIDL HAL""
...
am: fc6e8cae9c -s ours
Change-Id: I767f58a16ec318d760c64782a2215e0bac60a283
2016-11-18 20:39:42 +00:00
Connor O'Brien
fc6e8cae9c
Merge "Revert "Convert update_verifier to boot HIDL HAL""
2016-11-18 20:24:58 +00:00
Connor O'Brien
7206ec7a1d
Revert "Convert update_verifier to boot HIDL HAL"
...
This reverts commit 86199a47e1 .
Bug: 32973182
Change-Id: If3eab18cc2e810446da447fadfd0fb44c02b771b
2016-11-18 20:18:27 +00:00
Connor O'Brien
30628db65c
Revert "Convert update_verifier to boot HIDL HAL"
...
This reverts commit f50593c447 .
Bug: 32973182
Change-Id: I5b14a812671ea02575cb452242ff1a6f05edb9c1
2016-11-18 20:16:53 +00:00
Tao Bao
bedf5fc11c
updater: Refactor set_stage() and get_stage() functions.
...
Add read_bootloader_message_from() and write_bootloader_message_to() to
allow specifying the BCB device (/misc).
Also add testcases for set_stage() and get_stage().
Test: recovery_component_test passes.
Test: Build a recovery image and apply a two-step OTA package.
Change-Id: If5ab06a1aaaea168d2a9e5dd63c07c0a3190e4ae
2016-11-18 12:04:48 -08:00
Tao Bao
1ae9f22d6e
Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e am: d109c788ad
...
am: 9b1a791e3c
Change-Id: Ifdd250d55ad59887d92591858a820dc5e36d141b
2016-11-18 17:52:00 +00:00
Tao Bao
9b1a791e3c
Merge "updater: Add testcase for package_extract_dir()." am: 23e785935e
...
am: d109c788ad
Change-Id: Ia682f518ef8f2a651d0ecbef37a87b52d40a0f35
2016-11-18 17:49:00 +00:00
Tao Bao
d109c788ad
Merge "updater: Add testcase for package_extract_dir()."
...
am: 23e785935e
Change-Id: I9827d196b8cccd138e244a1aad64202baa1dd600
2016-11-18 17:45:58 +00:00