Commit graph

4733 commits

Author SHA1 Message Date
Treehugger Robot
5efe2bca22 Merge "Introduce VR recovery ui" 2017-06-17 00:00:00 +00:00
Luke Song
e2bd876043 Introduce VR recovery ui
A version of screen ui with specific adjustments for vr device
compatibility.

(cherrypick of a44dba7f4e to AOSP)

Bug: 37779982
Test: "adb reboot recovery" to view
Change-Id: If6b0f26c1b587f8d0176060685b5efb6c67593b1
2017-06-16 15:33:02 -07:00
Chih-hung Hsieh
80eb02dcbf Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d
am: 9f20e861b6

Change-Id: If364b9bcb40126e8b892e2ac6ed1530f9959a1a6
2017-06-16 16:09:29 +00:00
Chih-hung Hsieh
9f20e861b6 Merge "Add OWNERS in bootable/recovery"
am: ffd8505f4d

Change-Id: I2675a929464997b106818afd4cf8a28b3b65f69c
2017-06-16 16:05:57 +00:00
Chih-hung Hsieh
ffd8505f4d Merge "Add OWNERS in bootable/recovery" 2017-06-16 15:56:16 +00:00
Jeff Vander Stoep
eba11fa574 Fix "No file_contexts" warning
am: e35926e1af

Change-Id: Ia050561286c30d8198f3185da9e3cd31372b1d79
2017-06-16 02:57:57 +00:00
Jeff Vander Stoep
e35926e1af Fix "No file_contexts" warning
Fixed by Loading the file_contexts specified in libselinux, whereas
previously recovery loaded /file_contexts which no longer exists.

Bug: 62587423
Test: build and flash recovery on Angler. Warning is gone.
Test: Wipe data and cache.
Test: sideload OTA
Change-Id: I11581c878b860ac5f412e6e8e7acde811f37870f
(cherry picked from commit 2330dd8733)
2017-06-15 21:24:29 +00:00
Chih-Hung Hsieh
d6c49be5de Add OWNERS in bootable/recovery
* Owners are selected from top CL approvals or owners.
  They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
  https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/

Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: Ifb3f0a31389b2d55357fb6b8ea60c42dd790169d
2017-06-15 14:17:27 -07:00
Tianjie Xu
54138462b4 Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87
am: efa40b4827

Change-Id: Ie4c4bc3028fb41b49e5037ddca44680cf670c56a
2017-06-09 01:03:02 +00:00
Tianjie Xu
efa40b4827 Merge "Fix a race condition for temperature_logger"
am: 8e5fb46e87

Change-Id: If62d4548b541432963a4d3d41f299d19927c72d6
2017-06-09 01:01:03 +00:00
Tianjie Xu
8e5fb46e87 Merge "Fix a race condition for temperature_logger" 2017-06-09 00:56:39 +00:00
Tianjie Xu
379571098d Fix a race condition for temperature_logger
It's a rare deadlock that happens on fugu when the updater exits too
fast due to a format error.

Bug: 62379170
Test: fake-ota fails gracefully without hanging.
Change-Id: Icbd6cff4f6b44ca20f4d75f8039332111f696cc5
2017-06-08 12:10:30 -07:00
Tianjie Xu
d1b65aa645 Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb
am: 66e53f59b9

Change-Id: Iec9ae5171aaa2d8a0eb92de12b78e65aeb0136a4
2017-05-31 21:59:21 +00:00
Tianjie Xu
66e53f59b9 Merge "kill package_extract_dir" am: 99e7216907
am: 49f9c969eb

Change-Id: If8936fb2b090b83ad6fba39668d60e324662a42e
2017-05-31 21:57:18 +00:00
Tianjie Xu
49f9c969eb Merge "kill package_extract_dir"
am: 99e7216907

Change-Id: Ibc08736b0108151a4a023d971bd608654138d45e
2017-05-31 21:54:18 +00:00
Tianjie Xu
99e7216907 Merge "kill package_extract_dir" 2017-05-31 21:49:03 +00:00
Tianjie Xu
d38aec8de6 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a
am: 4a2cfffd33

Change-Id: Ifd32f346adefb90d043bccc3d6f20060ae3ca45d
2017-05-26 23:20:07 +00:00
Tianjie Xu
4a2cfffd33 Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af
am: 0f8e67088a

Change-Id: I8e7499d97f6acb505e42b9935d3b21a41695dba7
2017-05-26 23:15:36 +00:00
Tianjie Xu
0f8e67088a Merge "Implement a custom deflate sink function for bspatch"
am: 764eb215af

Change-Id: Ifac391f38d692a5312b4b03ff5eaf701da6d7d41
2017-05-26 23:13:36 +00:00
Tianjie Xu
764eb215af Merge "Implement a custom deflate sink function for bspatch" 2017-05-26 23:07:13 +00:00
Tianjie Xu
a897f95bd5 Implement a custom deflate sink function for bspatch
This new sink function works as a wrapper of the old sink. It deflates
the available patch data on the fly. Therefore, we don't need to store
the full uncompressed patch data in memory.

Test: recovery_component_test && apply an incremental update on angler
Change-Id: I2274ec50a1607089abcc9d0954a2a748f28c3122
2017-05-26 14:05:20 -07:00
Tianjie Xu
da1fcf7ab2 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71
am: aef046255a

Change-Id: Ib9ce75418ca56c2bb9fa68719371628b1763aa03
2017-05-24 18:54:04 +00:00
Tianjie Xu
aef046255a Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789
am: 66f02b4e71

Change-Id: I6e745992d384b6d870b2549d16dc40100175493e
2017-05-24 18:51:03 +00:00
Tianjie Xu
66f02b4e71 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails"
am: 9c1a114789

Change-Id: I45afda69f82147ba02b3e4666c3a296d84a2db47
2017-05-24 18:48:04 +00:00
Tianjie Xu
9c1a114789 Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" 2017-05-24 18:42:02 +00:00
David Zeuthen
8ed9738b62 update_verifier: Support AVB.
When using AVB, PRODUCT_SUPPORTS_VERITY is not set so check for
BOARD_ENABLE_AVB as well. Also AVB sets up the root filesystem as
'vroot' so map that to 'system' since this is what is
expected. Managed to test at least that the code is at least compiled
in:

 $ fastboot --set-active=_a
 Setting current slot to 'a'...
 OKAY [  0.023s]
 finished. total time: 0.023s

 $ fastboot reboot
 rebooting...

 finished. total time: 0.050s

 $ adb wait-for-device

 $ adb logcat |grep update_verifier
 03-04 05:28:56.773   630   630 I /system/bin/update_verifier: Started with arg 1: nonencrypted
 03-04 05:28:56.776   630   630 I /system/bin/update_verifier: Booting slot 0: isSlotMarkedSuccessful=0
 03-04 05:28:56.776   630   630 W /system/bin/update_verifier: Failed to open /data/ota_package/care_map.txt: No such file or directory
 03-04 05:28:56.788   630   630 I /system/bin/update_verifier: Marked slot 0 as booted successfully.
 03-04 05:28:56.788   630   630 I /system/bin/update_verifier: Leaving update_verifier.

Bug: None
Test: Manually tested on device using AVB bootloader.
Change-Id: I13c0fe1cc5d0f397e36f5e62fcc05c8dfee5fd85
2017-05-24 14:14:11 -04:00
Tianjie Xu
6957555e29 Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails
We have seen one case when bspatch failed likely due to patch
corruption. Since the package has passed verification before, we want
to reboot and retry the patch command again since there's no
alternative for users.

We won't delete the stash before reboot, and the src has passed SHA1
check. If there's an error on the patch, it will fail the package
verification during retry.

Bug: 37855643
Test: angler reboots and retries the update when bspatch fails.
Change-Id: I2ebac9621bd1f0649bb301b9a28a0dd079ed4e1d
2017-05-23 17:36:56 -07:00
Tianjie Xu
53c38b1538 kill package_extract_dir
It's only used by file-based OTA which has been deprecated for O.

Test: mma
Change-Id: I439c93155ca94554d827142c99aa6c0845cc7561
2017-05-23 17:09:45 -07:00
Tianjie Xu
0abe9860d8 Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d
am: 1562f41348

Change-Id: I7b605673eb3cee6a615459ca9fe2fc00c532ed9d
2017-05-18 22:20:55 +00:00
Tianjie Xu
1562f41348 Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48
am: 8f68accc9d

Change-Id: Ic81b2812030e8267a4d0d81d4909f84d284d1743
2017-05-18 22:16:24 +00:00
Tianjie Xu
8f68accc9d Merge "Print SHA1 of the patch if bsdiff fails with data error"
am: 1f9808bd48

Change-Id: I4900198d7c45c864e1a93bbd386b4ec36ed4cdec
2017-05-18 22:11:54 +00:00
Tianjie Xu
1f9808bd48 Merge "Print SHA1 of the patch if bsdiff fails with data error" 2017-05-18 22:02:03 +00:00
Tom Cherry
eefefc6c13 Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926
am: 01bcf118d5

Change-Id: Ie9103aedc7c0b61d505023238e0cb0ab327f7e84
2017-05-18 20:34:48 +00:00
Tom Cherry
01bcf118d5 Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94
am: 8226fd8926

Change-Id: I6a2b8df36703936560b84ec84555c3b5bb95cb0f
2017-05-18 20:31:18 +00:00
Tom Cherry
8226fd8926 Merge "libbootloader_message: convert to Android.bp"
am: bec0d4cb94

Change-Id: I0da04f8103a48f746801fdf9381571e4a812e8c3
2017-05-18 20:26:24 +00:00
Tom Cherry
bec0d4cb94 Merge "libbootloader_message: convert to Android.bp" 2017-05-18 20:18:00 +00:00
Tianjie Xu
1c120067c2 Fix the input parameter for "set_retry_bootloader_message"
am: 539b08cfcf

Change-Id: Idd730e8e9ae3dbf27bc20b4ff2c5a3e73e28ce5d
2017-05-18 17:58:02 +00:00
Tianjie Xu
1941f61fb6 Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76 am: 1d6f88675b
am: f1546892e1

Change-Id: If5d97891ffae307ada2948b771f113e82235fd73
2017-05-17 20:20:00 +00:00
Tianjie Xu
f1546892e1 Merge "Fix the input parameter for "set_retry_bootloader_message"" am: 0e60ccdc76
am: 1d6f88675b

Change-Id: I280282a1b2676e3030a0327239781f50fb7a64d8
2017-05-17 20:17:29 +00:00
Tianjie Xu
1d6f88675b Merge "Fix the input parameter for "set_retry_bootloader_message""
am: 0e60ccdc76

Change-Id: I881182909805359cb1042a25bb7d942586fbbaab
2017-05-17 20:13:31 +00:00
Tianjie Xu
0e60ccdc76 Merge "Fix the input parameter for "set_retry_bootloader_message"" 2017-05-17 20:02:12 +00:00
Tianjie Xu
539b08cfcf Fix the input parameter for "set_retry_bootloader_message"
We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.

Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
(cherry picked from commit 72449c9f99)
2017-05-17 11:52:17 -07:00
Tom Cherry
600e806384 libbootloader_message: convert to Android.bp
Test: build
Change-Id: Ia0c2e141673e37eea29306817d2f4b2c944213b0
2017-05-17 11:43:29 -07:00
Tianjie Xu
72449c9f99 Fix the input parameter for "set_retry_bootloader_message"
We're not updating argc & argv during get_args(), so some boot
arguments missed when we set the boot message for retry.

Bug: 38383406
Test: boot command sets correctly during retry attempt.
Change-Id: Ie8583a22fad5e0084245e3431d4018518d508dfd
2017-05-17 18:09:35 +00:00
Tianjie Xu
ce5fa5e538 Print SHA1 of the patch if bsdiff fails with data error
This will help us to identify the patch corruption.

Meanwhile fix a wrong size parameter passed to bspatch.
(patch->data.size() into patch->data.size() - patch_offset).

Also remove the only usage of "ApplyBSDiffPatchMem()" and inline its
Sink function for simplicity.

Bug: 37855643
Test: Prints SHA1 for corrupted patch in imgdiff_test.
Change-Id: Ibf2db8c08b0ded1409bb7c91a3547a6bf99c601d
2017-05-16 12:39:14 -07:00
Tao Bao
763b52dd45 Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b am: 843ca31c4c
am: 9539cdb3c0

Change-Id: Id6209c2f0e75a3b24bf50f64896cf8a5d1f080a5
2017-05-12 21:56:48 +00:00
Tao Bao
9539cdb3c0 Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." am: 494d97fe6b
am: 843ca31c4c

Change-Id: I3f7c6b2d4b4d7b56866f98e146cb3bf691a7a3f3
2017-05-12 21:51:17 +00:00
Tao Bao
843ca31c4c Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0."
am: 494d97fe6b

Change-Id: I48bf4260c586bdbcc12e615ff5b0ce6459f88c98
2017-05-12 21:45:47 +00:00
Tao Bao
494d97fe6b Merge "updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0." 2017-05-12 21:26:36 +00:00
Tao Bao
397a8137a0 updater: Update the mkfs.f2fs argument to match f2fs-tools 1.8.0.
Commit adeb41a8c0 has switched the
argument for recovery. This CL handles the case for updater.

Note that there's a chance the updater may run against the old
recovery (and f2fs 1.4.1 binary). Not sending a 0-sector argument to
f2fs 1.4.1 also works.

Bug: 37758867
Test: Make an OTA package that calls format f2fs, with mkfs.f2fs 1.8.0
      and 1.4.1 binaries respectively.
Change-Id: I4d4bbe8c57544d1c514b7aa37fbf22a0aab14e2c
2017-05-12 12:09:16 -07:00