Luke Song
e003fbaa2e
Merge "Introduce VR recovery ui" am: 5efe2bca22 am: 850e00951a
...
am: 8daabacce5
Change-Id: I7aaad686f788672b9fd8be2173c7b9976c19e04f
2017-06-17 00:20:39 +00:00
Luke Song
8daabacce5
Merge "Introduce VR recovery ui" am: 5efe2bca22
...
am: 850e00951a
Change-Id: I498b7b568523631f41f92994a003e77492616916
2017-06-17 00:11:37 +00:00
Luke Song
850e00951a
Merge "Introduce VR recovery ui"
...
am: 5efe2bca22
Change-Id: I5fb663d9922866aa57e0afcd6d86f3afdf0de8c9
2017-06-17 00:09:37 +00:00
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
14307c0c5f
Merge "Add OWNERS in bootable/recovery" am: ffd8505f4d am: 9f20e861b6
...
am: 80eb02dcbf
Change-Id: Id5ee47cf4f4537b041ce9313dc45c9ad1f498d7f
2017-06-16 16:13:28 +00: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
Android Build Merger (Role)
2ea95442ed
Merge "Fix "No file_contexts" warning am: e35926e1af am: 3445b94c89" into oc-dr1-dev-plus-aosp
2017-06-16 03:01:38 +00:00
Jeff Vander Stoep
29476681cb
Fix "No file_contexts" warning am: e35926e1af
...
am: eba11fa574
Change-Id: I278bc4d7af6892ecf3c2d259f6d7fd32a34f19ec
2017-06-16 03:01:28 +00:00
Jeff Vander Stoep
ce3f4dc513
Fix "No file_contexts" warning am: e35926e1af
...
am: 3445b94c89
Change-Id: I43f6596b266caff05e27c12ad1517e03e584d491
2017-06-16 03:01:28 +00:00
Jeff Vander Stoep
3445b94c89
Fix "No file_contexts" warning
...
am: e35926e1af
Change-Id: I32fdf32429d8574d901e94370bbc5a8db674542d
2017-06-16 02:58:00 +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
327193d252
Merge "Fix a race condition for temperature_logger" am: 8e5fb46e87 am: efa40b4827
...
am: 54138462b4
Change-Id: Id7c14730166326810d18283c3f1469446a4f71c6
2017-06-09 01:05:02 +00: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
1905e3665a
Merge "kill package_extract_dir" am: 99e7216907 am: 49f9c969eb am: 66e53f59b9
...
am: d1b65aa645
Change-Id: Idb46742fd2b73e927a14e12dd1b7ae5854e35334
2017-05-31 22:01:19 +00: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
177076fcd5
Merge "Implement a custom deflate sink function for bspatch" am: 764eb215af am: 0f8e67088a am: 4a2cfffd33
...
am: d38aec8de6
Change-Id: Ibdb1b48633736802bff664973fcd4c08dc9ac93a
2017-05-26 23:32:43 +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
75dee9b064
Merge "Retry the update if ApplyBSDiffPatch | ApplyImagePatch fails" am: 9c1a114789 am: 66f02b4e71 am: aef046255a
...
am: da1fcf7ab2
Change-Id: Icad68a225061426e396541d0f67374a530f1dcb3
2017-05-24 18:56:34 +00: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
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
f158a7d29e
Merge "Print SHA1 of the patch if bsdiff fails with data error" am: 1f9808bd48 am: 8f68accc9d am: 1562f41348
...
am: 0abe9860d8
Change-Id: Id8d4e4b369f30a33a37ca1895d5dd36eb2bf8aff
2017-05-18 22:25:55 +00: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
05a30df508
Merge "libbootloader_message: convert to Android.bp" am: bec0d4cb94 am: 8226fd8926 am: 01bcf118d5
...
am: eefefc6c13
Change-Id: I3bf255d47848e773b9d0e70224abb96ae15f6110
2017-05-18 20:42:50 +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
398092834b
Fix the input parameter for "set_retry_bootloader_message" am: 539b08cfcf
...
am: 1c120067c2
Change-Id: I45e25f7309f90ca3317d94d3f66e055fc02543b3
2017-05-18 18:13:46 +00:00