PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,123 Commits 1 Branch 0 Tags
c19d76833ace23f73cc3124a70a8a226862202ce
Commit Graph
8123 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Bao f35ce240a1 Merge "tests: Set up testdata path for continuous native tests." am: 4011bb161a 
am: a98b4e4bef

Change-Id: I7d360dd0446fa055c8810bd0c989b79e4a1dbaee
 2016-11-03 18:24:53 +00:00
Tao Bao a98b4e4bef Merge "tests: Set up testdata path for continuous native tests." 
am: 4011bb161a

Change-Id: I9ca5ab5081cc1f08fe1caa0d0d9baac4f2447efb
 2016-11-03 18:21:55 +00:00
Tao Bao 4011bb161a Merge "tests: Set up testdata path for continuous native tests." 2016-11-03 18:15:07 +00:00
Tao Bao 4102b28132 tests: Set up testdata path for continuous native tests. 
continuous_native_tests expects the testdata under DATA/ in
continuous_native_tests.zip. This CL packs a copy of the testdata into
continuous_native_tests.zip as DATA/nativetest/recovery/testdata (via
LOCAL_PICKUP_FILES).

This CL also removes the extra copy for nativetest64. Testdata will
always stay at /data/nativetest/recovery/testdata, even for 64-bit
version. Otherwise we will unnecessarily get four copies (two for data/
and another two for DATA/).

Bug: 32123241
Test: mmma bootable/recovery && adb sync data. On bullhead,
    /data/nativetest/recovery_component_test/recovery_component_test works;
    /data/nativetest64/recovery_component_test/recovery_component_test works.
Test: m continuous_native_test; DATA/nativetest/recovery/testdata exists.

Change-Id: Ifefa0309de7af23c77654e8e450848ca2da218c2
 2016-11-02 23:18:01 -07:00
Tao Bao 3809f75123 Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac am: 24356d778f 
am: 8172cddc82

Change-Id: I38a4f6b0e9d0627fa78782b6b0744af9989ccf77
 2016-11-02 17:32:33 +00:00
Tao Bao 8172cddc82 Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 am: 4fc42365ac 
am: 24356d778f

Change-Id: I6d95162b39478f0ea90676bf3635e2afa0b1536e
 2016-11-02 17:30:03 +00:00
Tao Bao 24356d778f Merge "applypatch: Add testcases for applypatch executable." am: 5696526ba4 
am: 4fc42365ac

Change-Id: I11edb4c0a9299c9824c1e82c7f996ec32be7a0c9
 2016-11-02 17:27:33 +00:00
Tao Bao 4fc42365ac Merge "applypatch: Add testcases for applypatch executable." 
am: 5696526ba4

Change-Id: I923ed0311335a798965cd83f0ba070223a0963b2
 2016-11-02 17:22:01 +00:00
Treehugger Robot 5696526ba4 Merge "applypatch: Add testcases for applypatch executable." 2016-11-02 17:19:45 +00:00
Tianjie Xu b059c4b554 Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 am: 0b6085a341 
am: c81ef65828

Change-Id: I245bea4f9fd484e7e22422835139b040efa33519
 2016-11-02 00:09:35 +00:00
Tianjie Xu c81ef65828 Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54 
am: 0b6085a341

Change-Id: I9b76ca015f94677775cc8dd75b755dd4b226183d
 2016-11-02 00:06:35 +00:00
Tianjie Xu 0b6085a341 Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c 
am: 88fc75ee54

Change-Id: Ie167a4fef7f877c0cb40715aa3bbb95a08e9926d
 2016-11-02 00:03:36 +00:00
Tianjie Xu 88fc75ee54 Merge "Cleanup ReadArgs & ReadValueArgs usage" 
am: a9b252887c

Change-Id: I2bf575fbb14165e7904d01b01b71ec6e3f24f068
 2016-11-02 00:01:05 +00:00
Tianjie Xu a9b252887c Merge "Cleanup ReadArgs & ReadValueArgs usage" 2016-11-01 23:53:02 +00:00
Tianjie Xu 5fe280ac96 Cleanup ReadArgs & ReadValueArgs usage 
ReadArgs will switch to using std::string and std::unique_ptr. Also
cleanup the callers.

Test: mma & component test passed.
Change-Id: I4724406ae6c0c134a27bbd1cdd24ad5d343b2a3b
 2016-11-01 15:03:06 -07:00
Tao Bao 36c3511952 applypatch: Add testcases for applypatch executable. 
Refactor applypatch/main.cpp into libapplypatch_modes so that we can add
testcases.

Some changes to applypatch/main.cpp:
 - Replace char** argv with const char**;
 - Use android::base::Split() to split ":";
 - Use android::base::ParseUInt().

Bug: 32383590
Test: Unit tests pass, install-recovery.sh works.

Change-Id: I44e7bfa5ab717d439ea1d0ee9ddb7b2c40bb95a4
 2016-11-01 14:40:14 -07:00
Tao Bao 2f9b98c99f Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 am: edf2928edf 
am: 492bd8ca71

Change-Id: Icc5e01085004386771175bda66a9eba9ed76d703
 2016-11-01 21:37:21 +00:00
Tao Bao 492bd8ca71 Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef am: bc48de6bf0 
am: edf2928edf

Change-Id: I475d65b39824734260cad5921f02a6eaad80bd4b
 2016-11-01 21:35:20 +00:00
Tao Bao edf2928edf Merge "applypatch: Switch the parameter of Value** to std::vector." am: 3f4030e0ef 
am: bc48de6bf0

Change-Id: Ibb887acf4d2afe46fbbe1193daddcf73eff3423e
 2016-11-01 21:32:50 +00:00
Tao Bao bc48de6bf0 Merge "applypatch: Switch the parameter of Value** to std::vector." 
am: 3f4030e0ef

Change-Id: I741638c51e9c3fe57cc874e6af86ea6a65d5aa71
 2016-11-01 21:30:20 +00:00
Sandeep Patil c4b381c44b healthd: change how charger is launched in recovery. 
This is triggered by changes in healthd which spits out 2 binaries.
Recovery needs to use static binary which is now renamed to 'charger'.
So, change the .rc file to match the rename.

Update the seclable according to new healthd-charger split

Test: Tested recovery on angler using 'reboot recovery' to ensure
healthd is working as before

Change-Id: I9e6018156e677e7224dd2e5894941ed2a7cac1d0
Signed-off-by: Sandeep Patil <sspatil@google.com>
 2016-11-01 14:27:23 -07:00
Tao Bao 3f4030e0ef Merge "applypatch: Switch the parameter of Value** to std::vector." 2016-11-01 21:25:12 +00:00
Tao Bao fada91ccf2 applypatch: Switch the parameter of Value** to std::vector. 
Test: Unit tests and install-recovery.sh pass on angler and dragon.

Change-Id: I328e6554edca667cf850f5584ebf1ac211e3d4d1
 2016-10-28 16:46:12 -07:00
Andriy Naborskyy 1d733369c4 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: 9ab6af5a61 -s ours 
am: 8b1840799e  -s ours

Change-Id: I3ae4272d78e9e9490c50cc5dfd7174996533e0ca
 2016-10-27 16:35:26 +00:00
Andriy Naborskyy 8b1840799e 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: 9ab6af5a61  -s ours

Change-Id: Ib10f137a0f23752ebc1d0090f9b90ba22504703b
 2016-10-27 16:30:56 +00:00
Andriy Naborskyy 9ab6af5a61 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: Id648e49a1e81d7cc22a273fbd209c18ffe1ea0b0
 2016-10-27 16:25:56 +00:00
Andriy Naborskyy 67bc0b9573 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

Change-Id: I8cfd3782a8cac351057b258d44caaa987397201d
 2016-10-27 16:21:56 +00:00
Andriy Naborskyy 3fdf1fd515 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

Change-Id: I7ecada4bf93f79a8b308064c417e85d4e7f9ecc3
 2016-10-27 16:16:55 +00:00
Andriy Naborskyy 8837b0d25d DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours am: 7ceb371048 -s ours 
am: b8c1788e7b  -s ours

Change-Id: I14de8cfdef94dfcb2d3f0760daf519537fa796d5
 2016-10-27 16:11:55 +00:00
Andriy Naborskyy b8c1788e7b DO NOT MERGE ANYWHERE init: move healthd to late-init am: 195ff7f79e -s ours 
am: 7ceb371048  -s ours

Change-Id: I5c36f2e8ee5e410e9027376c32e86baa7fa2e65a
 2016-10-27 16:07:25 +00:00
Andriy Naborskyy 7ceb371048 DO NOT MERGE ANYWHERE init: move healthd to late-init 
am: 195ff7f79e  -s ours

Change-Id: Ibf16373a783458fd91284254156d5a9a0d70252d
 2016-10-27 16:02:24 +00:00
Dan Albert 0c17fcd79b Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 am: 3456ee19f9 
am: ec31f732c3

Change-Id: Ib1aa18ed40bdafac182e90c66160a4951db4797d
 2016-10-27 05:10:20 +00:00
Dan Albert ec31f732c3 Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 am: 0c571e5923 
am: 3456ee19f9

Change-Id: Ia3b0e970555a256d0576a2b94c2f6825f279de7c
 2016-10-27 05:02:18 +00:00
Dan Albert 3456ee19f9 Merge "Revert "Some cleanups to recovery."" am: 9514eb1934 
am: 0c571e5923

Change-Id: I1a5b89905f24c2f20250a288345b6dbdea486cc1
 2016-10-27 04:58:20 +00:00
Dan Albert 0c571e5923 Merge "Revert "Some cleanups to recovery."" 
am: 9514eb1934

Change-Id: Id96135ffde5adaebd45811b9c3d319a99fe28ecd
 2016-10-27 04:53:48 +00:00
Treehugger Robot 9514eb1934 Merge "Revert "Some cleanups to recovery."" 2016-10-27 04:49:49 +00:00
Dan Albert 8584fcf677 Revert "Some cleanups to recovery." 
This reverts commit c0319b60f5.

Reason for revert: Broke builds.

Change-Id: I82aa880b83de5ae6c36fd7567cb001920559a972
 2016-10-27 03:08:08 +00:00
Tao Bao 5b4c017f98 Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 am: 05c68a8775 
am: aa2e4ddc30

Change-Id: I4c795abf9a8bfd8d59cf2d03af6fdd60f85264dc
 2016-10-26 23:47:02 +00:00
Tao Bao aa2e4ddc30 Merge "Some cleanups to recovery." am: 46fb0a6a6f am: 00f893fe23 
am: 05c68a8775

Change-Id: Id4a669bfce4f12a25ed78919d61de8c16a12fd27
 2016-10-26 23:42:01 +00:00
Tao Bao 05c68a8775 Merge "Some cleanups to recovery." am: 46fb0a6a6f 
am: 00f893fe23

Change-Id: Iea4884c8ea12f8edfdd7e39e8ec6e4cfff26f3a5
 2016-10-26 23:37:01 +00:00
Tao Bao 00f893fe23 Merge "Some cleanups to recovery." 
am: 46fb0a6a6f

Change-Id: Ic247a408b1bd3e2eab1db34eb4b14423d9fd16d6
 2016-10-26 23:32:30 +00:00
Treehugger Robot 46fb0a6a6f Merge "Some cleanups to recovery." 2016-10-26 23:26:04 +00:00
Tao Bao c0319b60f5 Some cleanups to recovery. 
- Remove the duplicate gCurrentUI variable in recovery.cpp;
- Refactor the load/save of locale functions;
- Clean up ui_print() to get rid of 256-byte buffer limit;
- Declare ui in common.h;
- Move the typedef of Volume into roots.h.

Test: Build and boot into recovery image.

Change-Id: Ia28c116858ca754133127a5ff9c722af67ad55b7
 2016-10-26 14:36:42 -07:00
Tao Bao cf2d15ae73 Merge "Skip update-on-boot for bootreason in blacklist" am: ebc141dff2 am: 750bb46305 am: 74851d8191 
am: 408edfafc5

Change-Id: I6d90c9822cf1ac5c440ab703c476b6b3bab42610
 2016-10-26 16:29:35 +00:00
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 eb9905b851 Merge "tests: Generate testdata for 2nd arch." am: 16e88679dc am: 8f9672c0db am: ab526b1246 
am: 86487d6855

Change-Id: If5ee190b0a1bc65bc048fadf77346405452adedf
 2016-10-26 00:07:09 +00:00