Commit Graph

6910 Commits

Author SHA1 Message Date
Remi NGUYEN VAN 9dd3fa8064 Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b am: 76eaa35201
am: 17762f01d1

Change-Id: Ide250a055d00d0b9e2f3786d1f737d5c61cb3cc8
2018-09-28 03:20:08 -07:00
Remi NGUYEN VAN 17762f01d1 Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" am: 968009cd5b
am: 76eaa35201

Change-Id: I62bed901dde046bc807b436d4df85d31f11cd9e0
2018-09-28 03:11:54 -07:00
Remi NGUYEN VAN 76eaa35201 Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency.""
am: 968009cd5b

Change-Id: Ia13095c45e217806326f6a44abf989ab09162f55
2018-09-28 02:59:01 -07:00
Remi NGUYEN VAN 968009cd5b Merge "Revert "recovery_test_component: Add libbinderthreadstate as static dependency."" 2018-09-28 09:42:53 +00:00
Remi NGUYEN VAN 26b86bb1dc Revert "recovery_test_component: Add libbinderthreadstate as static dependency."
This reverts commit a71c10b464.

Reason for revert: This breaks framework tests and blocks presubmit

Change-Id: Iae94878889c1e71e2da5336fe75af88dfd3bfcfa
2018-09-28 07:51:13 +00:00
Jayant Chowdhary 7ae8950935 Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f am: 20eb921f47
am: 927c8048a3

Change-Id: Ia5fe97749c11e42b41cff5cb98f501af04794bf5
2018-09-27 14:45:21 -07:00
Jayant Chowdhary 927c8048a3 Merge "recovery_test_component: Add libbinderthreadstate as static dependency." am: 2dcbebf88f
am: 20eb921f47

Change-Id: I74ba49651bbafd1810c3c5a3ddb70eb3a79a4dd2
2018-09-27 14:22:11 -07:00
Jayant Chowdhary 20eb921f47 Merge "recovery_test_component: Add libbinderthreadstate as static dependency."
am: 2dcbebf88f

Change-Id: Ifeff0896746981726a49117f1ad59a55dc064dc9
2018-09-27 14:14:37 -07:00
Jayant Chowdhary 2dcbebf88f Merge "recovery_test_component: Add libbinderthreadstate as static dependency." 2018-09-27 21:02:35 +00:00
Tianjie Xu 991336d3fc Merge "Enable fingerprint in care_map" am: f3d0e4783f am: 881f4225f2
am: 5dc4cde038

Change-Id: I327a2e711f2a810cdc6d9561cff1eb22f094869e
2018-09-27 11:01:50 -07:00
Tianjie Xu 5dc4cde038 Merge "Enable fingerprint in care_map" am: f3d0e4783f
am: 881f4225f2

Change-Id: I73b319d426896550e5ed037dd7f69de030ff2c46
2018-09-27 10:50:46 -07:00
Tianjie Xu 881f4225f2 Merge "Enable fingerprint in care_map"
am: f3d0e4783f

Change-Id: I9e15e8eb029b6da6142fd87318452a144f8c0a6a
2018-09-27 10:42:33 -07:00
Jayant Chowdhary a71c10b464 recovery_test_component: Add libbinderthreadstate as static dependency.
Bug: 110364143

Bug: 114311116

Test: mm -j64

Change-Id: I3b9174443b00ad57be60881736afde7647351bd1
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
2018-09-27 10:36:57 -07:00
Tianjie Xu f3d0e4783f Merge "Enable fingerprint in care_map" 2018-09-27 17:32:33 +00:00
Tao Bao d567f5d818 Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333 am: f4bf630200
am: afafd332ee

Change-Id: I9dd73c473860e765b2ef52fae0b7dfbdbe65f47f
2018-09-27 10:14:41 -07:00
Tao Bao afafd332ee Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." am: b32bd8a333
am: f4bf630200

Change-Id: I7bf8b3f1d1947107d873e3efdc973c51ca120037
2018-09-27 10:04:50 -07:00
Tao Bao f4bf630200 Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload."
am: b32bd8a333

Change-Id: I69e31f6c34da79ca7ae3600b97941717ff3d48b6
2018-09-27 09:55:48 -07:00
Tao Bao b32bd8a333 Merge "Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload." 2018-09-27 16:34:13 +00:00
katao 77d6173714 Allow OTA package size larger than 2GiB(2147483647 bytes) on sideload.
At present, multiple partitions such as vendor have been added,
which reduces the coupling between mobile phone manufacturers
and Android systems. However, it may increase the generated
package size substantially (e.g. from ~200MB to ~800MB).
Causes the package size to exceed the int limit (2147483647 bytes).
Change the int length parameters to long.

Bug: http://b/112003354
Test: adb sideload ota.zip (ota.zip bigger than 2147483647 bytes)
Change-Id: Ifb656431f7b961ac0e91754107578dc8b89ff14e
Signed-off-by: katao <katao@xiaomi.com>
2018-09-27 16:34:01 +00:00
Tianjie Xu f595a46735 Enable fingerprint in care_map
Enable the encoding and parsing of the property_id & partition
fingerprint by default; and add a flag "--no_fingerprint" to disable
the fingerprint generation/parsing to convert the legacy care_map.txt

Bug: 114778109
Test: run unittests in add_img_to_target_files
Change-Id: Id4216d5954e78c3a2d8e8bf19342109daf66a528
2018-09-26 20:14:53 -07:00
Hridya Valsaraju ca7bf02d2e Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c am: 4e30d0d687
am: ff47ab3ca4

Change-Id: Iacd90f207fcfeb6c7d47412cf41a7cdaf6507772
2018-09-24 13:27:16 -07:00
Hridya Valsaraju ff47ab3ca4 Merge "Enter into userspace fastboot only if the device supports it" am: c2e6f0410c
am: 4e30d0d687

Change-Id: Ibc7f6627e6f4dc246158bd7d9c44e26af4243334
2018-09-24 13:15:06 -07:00
Hridya Valsaraju 4e30d0d687 Merge "Enter into userspace fastboot only if the device supports it"
am: c2e6f0410c

Change-Id: I503f02ce45b582018672e84e04311ec2bac88c82
2018-09-24 13:07:55 -07:00
Treehugger Robot c2e6f0410c Merge "Enter into userspace fastboot only if the device supports it" 2018-09-24 19:41:22 +00:00
Tianjie Xu ae61f262e1 Merge "Refactor update_verifier into a class" am: ff29eb7f12 am: 4c65ab54c1
am: 68f9636e63

Change-Id: I084851d6806f82080c37a8ef97c984a039d42f04
2018-09-21 14:37:49 -07:00
Tianjie Xu 4ee7c4069b Merge "Move the parse of last_install to recovery-persist" am: 6c8c7c1975 am: d671cc136f
am: 6c2e947671

Change-Id: If731a1264198398dc61c40425c5ca2d93396cbfb
2018-09-21 14:05:30 -07:00
Tianjie Xu 68f9636e63 Merge "Refactor update_verifier into a class" am: ff29eb7f12
am: 4c65ab54c1

Change-Id: I5c974112c6f6e23f7b550e786eb10fe42a217f7e
2018-09-20 23:16:16 -07:00
Tianjie Xu 6c2e947671 Merge "Move the parse of last_install to recovery-persist" am: 6c8c7c1975
am: d671cc136f

Change-Id: I3e351a7dd4b7462f0bbff556fcd6ef830ed37e63
2018-09-20 22:55:37 -07:00
Tianjie Xu 4c65ab54c1 Merge "Refactor update_verifier into a class"
am: ff29eb7f12

Change-Id: Ibecfa11ad96f9b34c1c9a0096f5096e798a18054
2018-09-20 22:54:57 -07:00
Tianjie Xu d671cc136f Merge "Move the parse of last_install to recovery-persist"
am: 6c8c7c1975

Change-Id: I4c5dc50ff2a3cfe6c7205aa48e27687166be337c
2018-09-20 22:31:51 -07:00
Tianjie Xu ff29eb7f12 Merge "Refactor update_verifier into a class" 2018-09-21 00:03:59 +00:00
Tianjie Xu 446b64b659 Refactor update_verifier into a class
The refactor separates out the parsing of care_map and the actual
verification of the partitions. Moreover, it skips the verification in case
of a format error in the care map.

Also, the parsing of care_map now uses the suffix of the file to
tell if it has the protobuf format or the plain text format.

Bug: 115740187
Test: unit test pass
Change-Id: I7aa32004db02af1deb7bfdc6f5bd7921eb7883e5
2018-09-20 15:10:52 -07:00
Tianjie Xu 6c8c7c1975 Merge "Move the parse of last_install to recovery-persist" 2018-09-20 17:39:36 +00:00
Hridya Valsaraju 7f41a2cc4d Enter into userspace fastboot only if the device supports it
Test: For devices not supporting logical partitions, 'adb reboot
fastboot' command reboots into  Android.
Bug: 78793464

Change-Id: Ie6c6ccdebfee9302a9996ac5bc66069dbd817987
2018-09-19 21:35:47 -07:00
Hridya Valsaraju 6fcfbb46f8 Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" am: 9c675b0964 am: 1c0e985407
am: 144ea11b93

Change-Id: I1970602c8351013b72bb514df5f08a236419786f
2018-09-18 21:53:27 -07:00
Hridya Valsaraju 144ea11b93 Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" am: 9c675b0964
am: 1c0e985407

Change-Id: I9fd716be531f1f3acc558812bf6caa9c918782a9
2018-09-18 21:49:28 -07:00
Hridya Valsaraju 1c0e985407 Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd"
am: 9c675b0964

Change-Id: Ia5eae15ea7de7cc822e18ecd3f1fee55132c4f4c
2018-09-18 21:42:34 -07:00
Treehugger Robot 9c675b0964 Merge "Show 'Enter Fastboot' menu item only if device supports fastbootd" 2018-09-19 04:26:31 +00:00
Hridya Valsaraju daa301e3bd Show 'Enter Fastboot' menu item only if device supports fastbootd
Bug: 112664456
Test: Manual, 'Enter Fastboot' option not visible.
Change-Id: I2642391a69a11cd0496c1287130b3b0291c93232
2018-09-18 14:53:31 -07:00
Tao Bao d48a4c128a Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26 am: cda59a70f2
am: ad5d337832

Change-Id: I3f672481bb1057153bc35c3b9c472972f2c35e34
2018-09-17 16:38:10 -07:00
Tao Bao ad5d337832 Merge "Trigger the logging when prompting for wipe." am: 49dc0fed26
am: cda59a70f2

Change-Id: I7100220f3cafd6f7fb0865388e496796606c5372
2018-09-17 16:32:00 -07:00
Tao Bao cda59a70f2 Merge "Trigger the logging when prompting for wipe."
am: 49dc0fed26

Change-Id: Icdd186331061e68b9c06222b6dafd25e2487dd77
2018-09-17 16:27:58 -07:00
Treehugger Robot 49dc0fed26 Merge "Trigger the logging when prompting for wipe." 2018-09-17 23:18:16 +00:00
Tao Bao a5bbcb9596 Trigger the logging when prompting for wipe.
This allows recording the reason string that prompts user for a data
wipe, even if user selects 'Try again'.

Test: Inject an error into framework to trigger RescueParty. Select
      'Try again' and check the recovery log post-boot.
Change-Id: I0d7d5afcf38cae5019e2ce0a46d3cd1ac3e83a03
2018-09-17 14:37:27 -07:00
Tianjie Xu 2b1a464a70 Move the parse of last_install to recovery-persist
The recovery-persist used to look for the related recovery logs in
persist storage, and copy them under /data/misc/recovery during the
normal boot process.

As we also want to find out the sideload information from last_install,
it makes more sense to move the parse & report of non-a/b metrics to
recovery-persist. Thus we can avoid the race condition of the file
system between the native code and RecoverySystem.

Bug: 114278989
Test: unit test pass, check the event buffer for metrics report
Change-Id: I32d7b2b831bc74a61a70af9a2f0b8a7e9b3e36ee
2018-09-13 13:27:55 -07:00
Hridya Valsaraju 3d82f2ee23 Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6 am: 20b29bbbbd
am: 165478c774

Change-Id: Id8998826195d7433d4ef8389b08c7017279db014
2018-09-12 18:20:13 -07:00
Hridya Valsaraju 165478c774 Merge "Allow switch to fastbootd when userdata wipe is required" am: 16147d1bd6
am: 20b29bbbbd

Change-Id: Ibbf99302158a72b4f8170bb8fe3fc30db4b78cda
2018-09-12 18:06:03 -07:00
Hridya Valsaraju 20b29bbbbd Merge "Allow switch to fastbootd when userdata wipe is required"
am: 16147d1bd6

Change-Id: I475f0f48b4deab9c858fb7e5bd699e94d9a1b89e
2018-09-12 18:00:58 -07:00
Treehugger Robot 16147d1bd6 Merge "Allow switch to fastbootd when userdata wipe is required" 2018-09-13 00:48:42 +00:00
Hridya Valsaraju eb6f13aeb6 Allow switch to fastbootd when userdata wipe is required
Bug: 114065789
Test: Able to use 'adb reboot fastboot' to switch to fastboot
from recovery when a userdata wipe is required to boot.

Change-Id: Ice6950444656f8d8857808531af030078f544b88
2018-09-12 14:16:07 -07:00