1bb63f0dc2
Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58
...
am: 83b649ee1d
2016-11-30 21:39:24 +00:00
83b649ee1d
Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1
...
am: be54feda58
2016-11-30 21:34:24 +00:00
be54feda58
Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"
...
am: d255b661a1
2016-11-30 21:30:01 +00:00
d255b661a1
Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)"
2016-11-30 21:19:42 +00:00
848519fcfa
Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35
...
am: 95beb966e2
2016-11-30 19:23:16 +00:00
95beb966e2
Merge "Switch update verifier to HIDL HAL" am: 1528def46e
...
am: ae2463bb35
2016-11-30 19:17:46 +00:00
ae2463bb35
Merge "Switch update verifier to HIDL HAL"
...
am: 1528def46e
2016-11-30 19:12:14 +00:00
1528def46e
Merge "Switch update verifier to HIDL HAL"
2016-11-30 18:58:53 +00:00
6478f3804d
Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd
...
am: 8762a560fc
2016-11-29 18:09:12 +00:00
8762a560fc
Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08
...
am: 1f934beedd
2016-11-29 18:04:12 +00:00
1f934beedd
Merge "Remove ota_close(int) and ota_fclose(FILE*)."
...
am: 7b59b45b08
2016-11-29 17:59:10 +00:00
7b59b45b08
Merge "Remove ota_close(int) and ota_fclose(FILE*)."
2016-11-29 17:55:11 +00:00
f14a5ecbcf
Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3
...
am: 6a8e0eb164
2016-11-29 05:31:05 +00:00
5e5555d6c7
Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da
...
am: 5e52ac31d4
2016-11-29 05:30:54 +00:00
6a8e0eb164
Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf
...
am: 839fbbdad3
2016-11-29 05:26:08 +00:00
5e52ac31d4
Merge "tests: Add testcases for EMMC targets." am: d226f28e87
...
am: fcfdda98da
2016-11-29 05:25:55 +00:00
839fbbdad3
Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)."
...
am: eed7f607cf
2016-11-29 05:21:37 +00:00
fcfdda98da
Merge "tests: Add testcases for EMMC targets."
...
am: d226f28e87
2016-11-29 05:21:24 +00:00
eed7f607cf
Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)."
2016-11-29 05:15:18 +00:00
d226f28e87
Merge "tests: Add testcases for EMMC targets."
2016-11-29 05:13:10 +00:00
358c2ec1dc
Remove ota_close(int) and ota_fclose(FILE*).
...
We should always use unique_fd or unique_file to hold the FD or FILE*
pointer when opening via ota_(f)open functions.
This CL avoids accidentally closing raw FDs or FILE* pointers that are
managed by unique_fd/unique_file.
Test: recovery_component_test passes.
Change-Id: If58eb8b5c5da507563f85efd5d56276472a1c957
2016-11-28 12:09:39 -08:00
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
2016-11-23 22:52:19 +00:00
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
2016-11-23 22:45:04 +00:00
3dc14cb429
Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&).
...
We were using the below sequence prior to the CL in [1].
unique_fd fd(ota_open(...));
ota_close(fd);
fd.reset(ota_open(...));
fd.reset() may unintentionally close the newly opened FD if it
has the same value as the early ota_open. The CL in [1] changed to
"ota_close(fd.release())" to avoid the issue. This CL adds a new
overloaded function ota_close(unique_fd&) to handle the release
automatically.
Similarly add ota_fclose(std::unique_ptr<FILE>&).
[1] commit 48cf770471
2016-11-22 16:44:41 -08:00
eb718e1c99
DO NOT MERGE updater: Add "write_value()" function.
...
am: 1bf1772625
2016-11-22 21:10:58 +00:00
8dd44e907a
tests: Add testcases for EMMC targets.
...
There're two types of targets in applypatch: regular files and EMMC
targets. We have two sets of functions to handle them respectively.
This CL adds testcases to use "EMMC:filename:size:sha1" as the target
name, which triggers the code path for patching EMMC targets.
Bug: 33034669
Test: recovery_component_test passes.
Change-Id: I8f10c6c8d2c1fb083f06a83de91d9e23cb41fb6d
2016-11-21 23:32:33 -08:00
ad43d2dd30
Switch update verifier to HIDL HAL
...
Test: UV logs show success in both binderized and passthrough modes.
Bug: 31864052
Change-Id: Ied67a52c458dba7fe600e0fe7eca84db1a9f2587
Signed-off-by: Connor O'Brien <connoro@google.com >
2016-11-21 13:48:42 -08:00
d8e4f12ae0
Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d
...
am: b4aae79230
2016-11-21 19:42:38 +00:00
b4aae79230
Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407
...
am: 1aa41a106d
2016-11-21 19:37:38 +00:00
1aa41a106d
Merge "applypatch: Release FD when explicitly calling close."
...
am: a511a3c407
2016-11-21 19:32:37 +00:00
a511a3c407
Merge "applypatch: Release FD when explicitly calling close."
2016-11-21 19:24:09 +00:00
21a10e2cfa
Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85
...
am: 5713071c81
2016-11-21 19:22:07 +00:00
5713071c81
Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f
...
am: 2a962adc85
2016-11-21 19:16:37 +00:00
2a962adc85
Merge "Fail gracefully when we fail to fork the update binary"
...
am: 340a2d364f
2016-11-21 19:11:35 +00:00
340a2d364f
Merge "Fail gracefully when we fail to fork the update binary"
2016-11-21 19:06:37 +00:00
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
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
5c11172849
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours
...
am: 92ac9041c1
2016-11-21 01:37:28 +00:00
e988840a88
Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours
...
am: 8d7399f553
2016-11-21 01:37:15 +00:00
92ac9041c1
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
am: cf589f523a
2016-11-21 01:32:08 +00:00
8d7399f553
Import translations. DO NOT MERGE
...
am: 9a4ff5a900
2016-11-21 01:32:08 +00:00
cf589f523a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2016-11-21 01:24:53 +00:00
9a4ff5a900
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 32177112
Change-Id: I4d68cd0c69b40d1765cd74dfa730f56be01b5b23
2016-11-20 15:25:37 -08:00
073408a943
Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b
...
am: 4cbedcc679
2016-11-20 18:29:07 +00:00
4cbedcc679
Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc
...
am: fa62ae6d0b
2016-11-20 18:24:07 +00:00
fa62ae6d0b
Merge "Call update_engine_sideload from recovery."
...
am: 1d77c93bcc
2016-11-20 18:19:37 +00:00
1d77c93bcc
Merge "Call update_engine_sideload from recovery."
2016-11-20 18:13:14 +00:00
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
953851cb97
Merge "updater: Refactor set_stage() and get_stage() functions." am: c627cd6486 am: 146f92ab3e
...
am: 062a2cffb3
2016-11-20 05:18:19 +00:00
723b5d505f
Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master am: ad57e2ca2c
...
am: 9f4d385704
2016-11-20 05:14:00 +00:00
Tao Bao
Connor O'Brien
Andriy Naborskyy
Treehugger Robot
Matthew Bouyack
Bill Yi
Alex Deymo