PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,141 Commits 1 Branch 0 Tags
d0ecbfb729709d87256f751d4fc34981a2ee327b
Commit Graph

3141 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao d0ecbfb729 Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d am: f4fabe254c 
am: d8ce8fa609

Change-Id: Ia16ca3c82b3b7c5d88419a7719fce5355227958c
 2016-12-09 22:48:48 +00:00
Tao Bao d8ce8fa609 Merge "write_bootloader_message(<options>) should not reset stage field." am: f28afc191d 
am: f4fabe254c

Change-Id: I8cde0f335ff2c2a496f497d744ffc6a94ea832b7
 2016-12-09 22:43:47 +00:00
Tao Bao f4fabe254c Merge "write_bootloader_message(<options>) should not reset stage field." 
am: f28afc191d

Change-Id: I267a7130f70fef654e0cd5209d32ff4115250e45
 2016-12-09 22:39:18 +00:00
Tao Bao f28afc191d Merge "write_bootloader_message(<options>) should not reset stage field." 2016-12-09 22:33:49 +00:00
Tao Bao 3ab15c4dd8 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c am: 6be6680109 
am: d4ceb1fb64

Change-Id: I0be84193224de80faf8ca32b62bb75180fa03d1f
 2016-12-09 20:04:39 +00:00
Tao Bao d4ceb1fb64 Merge "recovery: Fix the argument parsing from COMMAND_FILE." am: 332af25b7c 
am: 6be6680109

Change-Id: I3cd516e8bb86f685143847e11624df4791183437
 2016-12-09 19:59:09 +00:00
Tao Bao 6be6680109 Merge "recovery: Fix the argument parsing from COMMAND_FILE." 
am: 332af25b7c

Change-Id: Ib7cdd050d4f20c61ac35c1fb1ad469c5b1c72262
 2016-12-09 19:54:08 +00:00
Tao Bao 332af25b7c Merge "recovery: Fix the argument parsing from COMMAND_FILE." 2016-12-09 19:48:58 +00:00
Tao Bao 7d34fa17ab recovery: Fix the argument parsing from COMMAND_FILE. 
Commit f0ed159f48 didn't ensure mounting
COMMAND_FILE (i.e. /cache) prior to reading. Also the first argument in
COMMAND_FILE should not be dropped (unlike the first "recovery" argument
in BCB message).

Bug: 33431888
Test: Push /cache/recovery/command and recovery imag parses the
      arguments successfully.

Change-Id: Ica3157a0bb03a2355315123354617eaf3fff15a4
 2016-12-08 18:15:29 -08:00
Tao Bao 93c92baa8e Merge "recovery: Clean up get_args()." am: 3aadbbac39 am: c3ab25c237 
am: dd9c5674df

Change-Id: I1e3c26c8179cf6039d8ac801a9a4d6f6be59bbca
 2016-12-05 23:42:15 +00:00
Tao Bao dd9c5674df Merge "recovery: Clean up get_args()." am: 3aadbbac39 
am: c3ab25c237

Change-Id: I29a01238bba2cd35e48a03275e3ada4d4fee2888
 2016-12-05 23:38:45 +00:00
Tao Bao c3ab25c237 Merge "recovery: Clean up get_args()." 
am: 3aadbbac39

Change-Id: I8dd8003433ae2a33da51d69c25fe1b51628c8f97
 2016-12-05 23:35:16 +00:00
Tao Bao 7e31f421a5 write_bootloader_message(<options>) should not reset stage field. 
Commit bd56f1590c switches to calling
write_bootloader_message(<options>) in get_args(), which
unintentionally resets the stage field thus breaks two-step OTAs.

This CL changes write_bootloader_message(<options>) to only set the
command field (to "boot-recovery") and the recovery field (with the
specified options).

Test: Apply a two-step package.
Change-Id: I6905918812c7d3402cc1524688079066a4d22d29
 2016-12-05 15:31:52 -08:00
Tao Bao 3aadbbac39 Merge "recovery: Clean up get_args()." 2016-12-05 23:28:36 +00:00
Tao Bao f0ed159f48 recovery: Clean up get_args(). 
Test: Boot into new recovery image, verify the parsed parameters.
Change-Id: Ieefafb26cc4147ce4cb9ced4297cdb3b5d1d3789
 2016-12-05 11:39:46 -08:00
Tao Bao dd570b59ad Merge "updater: Switch to libbase logging." am: d2c56629ab am: 1d9779b57b 
am: 997ccbc5a4

Change-Id: Ic5a9d53af6e59c1e0ba16dd6275f941a21e4b98d
 2016-12-02 05:52:55 +00:00
Tao Bao 997ccbc5a4 Merge "updater: Switch to libbase logging." am: d2c56629ab 
am: 1d9779b57b

Change-Id: I92e782fc5b4df4a952f0759fb15f80754dce7802
 2016-12-02 05:45:25 +00:00
Tao Bao 1d9779b57b Merge "updater: Switch to libbase logging." 
am: d2c56629ab

Change-Id: Iadb27da225c4b0c7c6bc80d177d36bdf87296a5b
 2016-12-02 05:37:54 +00:00
Tao Bao d2c56629ab Merge "updater: Switch to libbase logging." 2016-12-02 05:27:04 +00:00
Tao Bao 65383535a7 Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 am: 80cd188162 
am: bd8f34190c

Change-Id: I8d5eb7a5abff461df9620bdef598797be0033f87
 2016-12-01 17:36:08 +00:00
Tao Bao bd8f34190c Merge "bootable/recovery: cleanup compiler warnings (unused value)" am: ef3bea15b8 
am: 80cd188162

Change-Id: I14483f9a2272767d0f7fec426875b8dbb2fcd350
 2016-12-01 17:30:38 +00:00
Tao Bao 80cd188162 Merge "bootable/recovery: cleanup compiler warnings (unused value)" 
am: ef3bea15b8

Change-Id: I401597b9d7bad8a13c98093019cd6ad915d325f3
 2016-12-01 17:25:37 +00:00
Tao Bao ef3bea15b8 Merge "bootable/recovery: cleanup compiler warnings (unused value)" 2016-12-01 17:03:13 +00:00
Tao Bao 039f2da3e4 updater: Switch to libbase logging. 
Test: Build an updater into a package and apply it on device.
Change-Id: I289b5768e9b1e44ef78e0479c64dbaa36fb1a685
 2016-11-30 23:44:41 -08:00
Tao Bao 1bb63f0dc2 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 am: be54feda58 
am: 83b649ee1d

Change-Id: I785c6ec399ee2695af9276b47559f93d7d010a48
 2016-11-30 21:39:24 +00:00
Tao Bao 83b649ee1d Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" am: d255b661a1 
am: be54feda58

Change-Id: I2ba381a2c142df54122009bdcec539afca800824
 2016-11-30 21:34:24 +00:00
Tao Bao be54feda58 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" 
am: d255b661a1

Change-Id: I700b0591b9e67ff7932598da1e48c9fa793bb763
 2016-11-30 21:30:01 +00:00
Tao Bao d255b661a1 Merge "bootable/recovery: cleanup compiler warnings (potential leak of memory)" 2016-11-30 21:19:42 +00:00
Connor O'Brien 848519fcfa Merge "Switch update verifier to HIDL HAL" am: 1528def46e am: ae2463bb35 
am: 95beb966e2

Change-Id: I55f81ecdf29f79736f111bd54b0e38e476a2e0c6
 2016-11-30 19:23:16 +00:00
Rahul Chaudhry a793c58208 bootable/recovery: cleanup compiler warnings (unused value) 
bootable/recovery/applypatch/imgdiff.cpp:322:11: warning: Value stored to 'ret' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
bootable/recovery/applypatch/imgdiff.cpp:447:11: warning: Value stored to 'ret' during its initialization is never read [clang-analyzer-deadcode.DeadStores]
bootable/recovery/applypatch/imgdiff.cpp:553:3: warning: Value stored to 'ret' is never read [clang-analyzer-deadcode.DeadStores]

Bug: 26936282
Test: WITH_TIDY=1 WITH_STATIC_ANALYZER=1 mm
Change-Id: I3f865e3e9b9d19e5ea5e8dfd2fe2c644254ffbb5
 2016-11-30 11:18:32 -08:00
Connor O'Brien 95beb966e2 Merge "Switch update verifier to HIDL HAL" am: 1528def46e 
am: ae2463bb35

Change-Id: I92b714794116eb2bc07689995a9ac90932f2e30f
 2016-11-30 19:17:46 +00:00
Connor O'Brien ae2463bb35 Merge "Switch update verifier to HIDL HAL" 
am: 1528def46e

Change-Id: I77f12c0c865b04e191039de4b15482c02d5d5d9e
 2016-11-30 19:12:14 +00:00
Connor O'Brien 1528def46e Merge "Switch update verifier to HIDL HAL" 2016-11-30 18:58:53 +00:00
Tao Bao 6478f3804d Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 am: 1f934beedd 
am: 8762a560fc

Change-Id: Icb260caeb155cbd6db7b8810816b237ade3ed49f
 2016-11-29 18:09:12 +00:00
Tao Bao 8762a560fc Merge "Remove ota_close(int) and ota_fclose(FILE*)." am: 7b59b45b08 
am: 1f934beedd

Change-Id: I8b6c56b88212b7e4b3095371a34aa5313a0a8cf2
 2016-11-29 18:04:12 +00:00
Tao Bao 1f934beedd Merge "Remove ota_close(int) and ota_fclose(FILE*)." 
am: 7b59b45b08

Change-Id: I5d325de48d99c8056bdf95381537ba6b938822f0
 2016-11-29 17:59:10 +00:00
Tao Bao 7b59b45b08 Merge "Remove ota_close(int) and ota_fclose(FILE*)." 2016-11-29 17:55:11 +00:00
Tao Bao f14a5ecbcf Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf am: 839fbbdad3 
am: 6a8e0eb164

Change-Id: I481327e831b2748d6dfa1b347ede324fdd2b9629
 2016-11-29 05:31:05 +00:00
Tao Bao 5e5555d6c7 Merge "tests: Add testcases for EMMC targets." am: d226f28e87 am: fcfdda98da 
am: 5e52ac31d4

Change-Id: If3d7b3363f1fb92fb0cc47006c659facf1615db7
 2016-11-29 05:30:54 +00:00
Tao Bao 6a8e0eb164 Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." am: eed7f607cf 
am: 839fbbdad3

Change-Id: I20241752ad6de90c0db0dea41d7af791c75dec4b
 2016-11-29 05:26:08 +00:00
Tao Bao 5e52ac31d4 Merge "tests: Add testcases for EMMC targets." am: d226f28e87 
am: fcfdda98da

Change-Id: If516f2b4b970fb1ef4688983cb890df8043dc704
 2016-11-29 05:25:55 +00:00
Tao Bao 839fbbdad3 Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." 
am: eed7f607cf

Change-Id: Ib570d0f548cc680e9c8f38c43573f71c52494ee9
 2016-11-29 05:21:37 +00:00
Tao Bao fcfdda98da Merge "tests: Add testcases for EMMC targets." 
am: d226f28e87

Change-Id: Ifadb3608e4856e5b4075b717cdb9c21c04162548
 2016-11-29 05:21:24 +00:00
Tao Bao eed7f607cf Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." 2016-11-29 05:15:18 +00:00
Tao Bao d226f28e87 Merge "tests: Add testcases for EMMC targets." 2016-11-29 05:13:10 +00:00
Tao Bao 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
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 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.

Bug: 33034669
Test: recovery_component_test passes.
Change-Id: Ief91edc590e95a7426e33364b28754173efb1056
 2016-11-22 16:44:41 -08: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