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
48be23c8ed
Remove outdated reference to icon_installing.png
...
The Wear recovery UI doesn't draw the installing icon but it was still
trying to open it. Ever since these images were removed eight months
ago, this has resulted in an error printing to the screen at runtime.
Since the image wasn't really used, the lines to open it can simply be
removed.
Bug: 33203397
Change-Id: Id820f6d75e316c51d19b6095df407ecd61c0410e
2016-11-29 13:50:56 -08:00
aaeafe73e9
Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd am: 8762a560fc
...
am: 6478f3804d
2016-11-29 18:14:13 +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
8da96cb392
Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 am: 6a8e0eb164
...
am: f14a5ecbcf
2016-11-29 05:35:38 +00:00
7bf69978de
Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da am: 5e52ac31d4
...
am: 5e5555d6c7
2016-11-29 05:35:26 +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
9f1d0c5a72
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
...
am: 59590f325b
2016-11-23 22:58:16 +00: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
6ce8483c9a
DO NOT MERGE updater: Add "write_value()" function. am: 1bf1772625 -s ours
...
am: eb718e1c99
2016-11-22 21:14:28 +00: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
57cad85699
Merge "applypatch: Release FD when explicitly calling close." am: a511a3c407 am: 1aa41a106d am: b4aae79230
...
am: d8e4f12ae0
2016-11-21 19:48:08 +00: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
b619fe60fd
Merge "Fail gracefully when we fail to fork the update binary" am: 340a2d364f am: 2a962adc85 am: 5713071c81
...
am: 21a10e2cfa
2016-11-21 19:27: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
ef77aa2b73
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: cf589f523a -s ours am: 92ac9041c1 -s ours
...
am: 5c11172849
2016-11-21 01:41:44 +00:00
182fee1771
Import translations. DO NOT MERGE am: 9a4ff5a900 -s ours am: 8d7399f553 -s ours
...
am: e988840a88
2016-11-21 01:41:31 +00: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
1fdd96f52a
Merge "Call update_engine_sideload from recovery." am: 1d77c93bcc am: fa62ae6d0b am: 4cbedcc679
...
am: 073408a943
2016-11-20 18:33:38 +00: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
Connor O'Brien
Tim Kryger
Tao Bao
Andriy Naborskyy
Treehugger Robot
Matthew Bouyack
Bill Yi