Commit graph

8782 commits

Author SHA1 Message Date
David Anderson
bc4b39efff Merge "Force merges to complete before wiping data or metadata."
am: 8444dec7ac

Change-Id: If50fd0536584c8e1271ea6212c9fe76e9b208b22
2019-11-14 20:38:26 -08:00
David Anderson
8444dec7ac Merge "Force merges to complete before wiping data or metadata." 2019-11-15 04:27:59 +00:00
Tianjie Xu
88bf6d20eb Clear the warm_reset flag after boot is successful
The property is set to inform kernel to do a warm_reset on the next
reboot. This is useful to persist the logs to debug device boot
failures. After the slot has been marked as boot successful, we can drop
the warm_reset flag to avoid the performance overhead on the next
reboot.

Bug: 143489994
Test: check the property is set to 0 by update_verifier
Change-Id: I722fb1906e6efa56dfc4ad7beccd5e2ba7e0ef7c
2019-11-14 17:43:56 -08:00
Tianjie Xu
28064ccf0b Move misc_writer to hardare/google/pixel
Because the library is pixel specific.

Bug: 131775112
Test: build
Change-Id: Ib62230bb2ab4d67864827e08375250fbfe189ed4
2019-11-13 15:59:55 -08:00
Tianjie Xu
5d1f8cdc82 Merge "Consolidate the vendor space misc usage for Pixels" am: 423f0d109b am: 85808f6a69
am: f0f95decb3

Change-Id: Id682d2089c3f0a0c56670e5e81fad6513e2fc46c
2019-11-13 14:41:58 -08:00
Tianjie Xu
f0f95decb3 Merge "Consolidate the vendor space misc usage for Pixels" am: 423f0d109b
am: 85808f6a69

Change-Id: I52ea38012af730ad58426e9238b6a5d59184ac29
2019-11-13 14:38:27 -08:00
Tianjie Xu
85808f6a69 Merge "Consolidate the vendor space misc usage for Pixels"
am: 423f0d109b

Change-Id: Iebafc18e0ae8ee54aab3008a7767a3901bb038cd
2019-11-13 14:35:07 -08:00
Tianjie Xu
423f0d109b Merge "Consolidate the vendor space misc usage for Pixels" 2019-11-13 22:24:19 +00:00
Tom Cherry
26dde7e04d Merge "Fixed typo during stopping fastboot" am: 8834b4ea0a am: cfcadc3b33
am: da369dd305

Change-Id: I0b023670ea67b0e72c49b50a838e8169367650f3
2019-11-13 12:40:21 -08:00
Tom Cherry
da369dd305 Merge "Fixed typo during stopping fastboot" am: 8834b4ea0a
am: cfcadc3b33

Change-Id: Ie29311740033f6581f4fdcfe66cb65c970de7ebe
2019-11-13 12:36:21 -08:00
Tom Cherry
cfcadc3b33 Merge "Fixed typo during stopping fastboot"
am: 8834b4ea0a

Change-Id: I80d1cf7fb447f4377b3cac7fd495289af1c961a9
2019-11-13 12:32:20 -08:00
Tom Cherry
8834b4ea0a Merge "Fixed typo during stopping fastboot" 2019-11-13 20:18:22 +00:00
Tom Cherry
e57fdb72f2 [automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 154f7e9b79 am: 054861f9eb -s ours
am: 038282ddfb -s ours
am skip reason: change_id I1fb6690d4302a1884d8521c21a9754b2ca710d5a with SHA1 24dd3146e1 is in history

Change-Id: I47bc5a96164ccb51882b6237b46497b107d31542
2019-11-13 08:21:18 -08:00
Tom Cherry
038282ddfb [automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 154f7e9b79
am: 054861f9eb -s ours
am skip reason: change_id I1fb6690d4302a1884d8521c21a9754b2ca710d5a with SHA1 24dd3146e1 is in history

Change-Id: I6f54fad5521da4145893b3ad9dc70548ffbc4f08
2019-11-13 08:13:36 -08:00
Tom Cherry
054861f9eb Merge "Move init and ueventd scripts from / to /system/etc"
am: 154f7e9b79

Change-Id: I60b076de3aefa8dc40cac3b36965857ab48429f8
2019-11-13 08:05:59 -08:00
Tom Cherry
154f7e9b79 Merge "Move init and ueventd scripts from / to /system/etc" 2019-11-13 14:36:47 +00:00
Dmytro Prokopchuk
df35405a4b Fixed typo during stopping fastboot
Change-Id: I0a589d068807e255654c7e62831423f944b5cdc3
Signed-off-by: Dmytro Prokopchuk <dmytro.prokopchuk@globallogic.com>
2019-11-13 13:30:17 +02:00
Tianjie Xu
3d57c84476 Consolidate the vendor space misc usage for Pixels
The layout of the vendor space /misc partition was pretty confusing and
lead to some usage conflicts. To formalize the layout, we create a pixel
specific library with the definition & offset of various flags. The new
library also handles the R/W. As a result, we will leave system domain
/misc definitions in the libbootloader_message.

We also switch the misc_writer binary to use more specific options
instead of writing an arbitrary hex string. So we can avoid redefining
the string & offset in both init script and recovery ui.

Bug: 131775112
Test: unit tests pass, run misc_writer and check contents of /misc
Change-Id: I00f8842a81d1929e31a1de4d5eb09575ffad47c0
2019-11-12 10:53:04 -08:00
Tom Cherry
a762387a5b Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp
am: e5939e8297

Change-Id: If9b38a494e6385ccd2e5ae31c15d5d429b082efc
2019-11-12 07:57:06 -08:00
Tom Cherry
e5939e8297 Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp 2019-11-12 15:46:21 +00:00
David Anderson
89d2d050a0 Force merges to complete before wiping data or metadata.
After an OTA is applied, a wipe in recovery may overwrite components of
dynamic partitions living in userdata. If the OTA has not yet begun
merging, we mark the current slot unbootable. If the OTA has begun
merging, we wait for the merge to complete. This logic is encapsulated
in libsnapshot.

Bug: 139156011
Test: manual test
Change-Id: Id6544a1b8583afcbba11559d46214ec2e68ffa40
2019-11-11 01:02:12 +00:00
David Anderson
af2f63cbf9 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." am: 405f4d3552 am: ff8131a493
am: 80415b0f40

Change-Id: I37a2e32ce7cfc88cff58ea6297480130bfba0de2
2019-11-09 07:21:16 -08:00
David Anderson
80415b0f40 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." am: 405f4d3552
am: ff8131a493

Change-Id: Id94bb0563331d162d5bef13c6d5465175395bdcd
2019-11-09 07:17:15 -08:00
David Anderson
ff8131a493 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus."
am: 405f4d3552

Change-Id: Ic37fa503b0e3eea75e2c7076e01979e05b3fe2b8
2019-11-09 07:13:15 -08:00
David Anderson
405f4d3552 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." 2019-11-09 15:04:52 +00:00
David Anderson
cf8427af89 bootloader_message: Add helpers for handling IBootControl MergeStatus.
Move merge_status from bootloader_control_ab, which is in vendor space,
to a new generic AOSP struct in system space. This will allow more
devices to share the same HAL implementation.

This patch also changes libboot_control to compensate for merge_status
moving out of vendor space. The reference HAL library now also provides
separate helper functions for managing the merge status, so devices
using a custom boot control HAL can still take advantage of the new misc
implementation.

Bug: 139156011
Test: manual test
Change-Id: I5cd824e25f9d07aad1476301def5cdc3f506b029
2019-11-08 15:22:21 -08:00
Tom Cherry
24dd3146e1 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot + boot to recovery
Merged-In: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
Change-Id: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
2019-11-07 19:38:23 +00:00
Tianjie Xu
d3a9bf5cf3 Merge "Stop setting usb config from recovery init script" am: 6105aa1a4a am: 4e0d813e39
am: 216e31cd8e

Change-Id: I23c949b684fe4f9b23b1895286cd672c5f109144
2019-11-07 11:34:37 -08:00
Tom Cherry
bcd3f35462 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot + boot to recovery
Merged-In: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
Change-Id: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
2019-11-07 11:29:06 -08:00
Tianjie Xu
216e31cd8e Merge "Stop setting usb config from recovery init script" am: 6105aa1a4a
am: 4e0d813e39

Change-Id: I5d6461df326ece34dbaac6216d0caa479397463b
2019-11-07 11:22:06 -08:00
Tianjie Xu
4e0d813e39 Merge "Stop setting usb config from recovery init script"
am: 6105aa1a4a

Change-Id: I39a81f9e1e8327794f3f6032508181645870c9cd
2019-11-07 11:14:55 -08:00
Tianjie Xu
6105aa1a4a Merge "Stop setting usb config from recovery init script" 2019-11-07 18:25:07 +00:00
Tom Cherry
0a19ef8cb6 Stop setting usb config from recovery init script
We used to set sys.usb.config to adb in the init script. And the purpose
is to start adbd. This is a duplicate of code because we always check and
reset the usb config in recovery_main.

Test: check adbd starts
Change-Id: I6e2842ff8aebf6ccf3bd3f2ae85323899a2b9de4
2019-11-06 23:04:36 -08:00
David Anderson
c9548fce84 Merge "bootloader_message: Carve out space reserved for system." am: 8243388d57 am: bf23ee57e4
am: 1caaf16379

Change-Id: I55cf76a792a593e05e22b504998bd4fb3ef2189d
2019-11-05 14:43:29 -08:00
David Anderson
1caaf16379 Merge "bootloader_message: Carve out space reserved for system." am: 8243388d57
am: bf23ee57e4

Change-Id: Ib8d83d458577c317e3bff08e9ab28dd553b89553
2019-11-05 14:37:27 -08:00
David Anderson
bf23ee57e4 Merge "bootloader_message: Carve out space reserved for system."
am: 8243388d57

Change-Id: I1c124ae8e05e0fbb76b95ce27f3c56ce9b1740be
2019-11-05 14:31:27 -08:00
David Anderson
8243388d57 Merge "bootloader_message: Carve out space reserved for system." 2019-11-05 22:16:16 +00:00
Tianjie Xu
033225bc26 Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c am: e5288e6b69
am: 845bf488cb

Change-Id: I0ac1f3a38e0def87e3d06e34e49097f311da6a18
2019-11-05 14:13:30 -08:00
Tianjie Xu
845bf488cb Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c
am: e5288e6b69

Change-Id: I02c35302868aacdbc5ff513034f42e475a0805c7
2019-11-05 14:07:27 -08:00
Tianjie Xu
e5288e6b69 Merge "Start adbd in user mode if bootloader is unlocked"
am: b65dd9cb0c

Change-Id: I0daecb3e2a15c449babfc94d6f3deca8b55a4924
2019-11-05 14:00:48 -08:00
Tianjie Xu
b65dd9cb0c Merge "Start adbd in user mode if bootloader is unlocked" 2019-11-05 21:37:07 +00:00
David Anderson
4ff4cbdd6c bootloader_message: Carve out space reserved for system.
This reduces the wipe space from 32K to 16K. The wipe space is now
at the 16K-32K region. The 32K-64K region is now "system space", to
complement the vendor space, for generic AOSP usage.

Bug: 139156011
Test: manual test
Change-Id: I1474bfa65a5f21049ab64ec0aee2f4585b55f60f
2019-11-04 15:57:04 -08:00
Xin Li
f289bba2cf [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 547b9dc313
am: 50a5d5da7e -s ours
am skip reason: subject contains skip directive

Change-Id: I88fce7b65ac0028b8140f0d07844feca55325151
2019-10-31 14:01:10 -07:00
Xin Li
50a5d5da7e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 547b9dc313

Change-Id: I6a34c7e4acdbdcff47847f069ec3a989ed41b6ba
2019-10-31 13:13:41 -07:00
Xin Li
547b9dc313 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I551bae56668132a81bba652e01d7f8851f41a604
2019-10-30 11:46:28 -07:00
Tianjie Xu
7d5c341962 Start adbd in user mode if bootloader is unlocked
During automatic tests, we sometimes want to reboot the device out of
the rescue party remotely. And per http://go/recovery-adb-access, one
option is to start adbd in user build if the device has an unlocked
bootloader. This should not add more surface of attack. Because verified
boot is off with the unlocked bootloader, and the user can always flash
a custom recovery image that always starts adbd.

Bug: 141247819
Test: check adbd doesn't start in user build, unlock bootloader, and
check adbd starts.

Change-Id: I851746245f862cb4dfb01e6c3ad035f2c9f9ccec
2019-10-30 10:26:56 -07:00
Tom Marshall
e632d03206 recovery: Remove HOST_OS guard for f2fs tools
These build correctly under MacOS.

Change-Id: I00bf26fdcc4ed560111e5c0b8f649feec72579d8
2019-10-29 20:05:45 +02:00
Xin Li
8f621f209d [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours am: 341e99e9b4 -s ours
am: 450fdc6943 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: I60ba22e7886673d4ac45e3f7d12f48a9c2565686
2019-10-26 22:23:08 -07:00
Xin Li
450fdc6943 [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours am: 5854abbb43 -s ours
am: 341e99e9b4 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: I47843f764156112cfe2ff164c98186ca4a773d7d
2019-10-26 22:16:07 -07:00
Xin Li
341e99e9b4 [automerger skipped] Merge Coral/Flame into AOSP master am: c73a97c6ee -s ours
am: 5854abbb43 -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Idc3f78654c812b946011f2b7b9dc179536108c94
2019-10-26 22:10:12 -07:00