Commit graph

8399 commits

Author SHA1 Message Date
Joshua Lambert
94a83be42a Revert "Add mechanism for device-specific loop images"
This reverts commit fd6a2c226d.

Reason for revert: Mechanism already exists:
https://source.android.com/devices/tech/ota/nonab/device_code#recovery-ui-images

Change-Id: Ic7b640b5d435cfb6f5c2610a2534405fb9415936
2019-12-09 20:24:18 +00:00
Joshua Lambert
fd6a2c226d Add mechanism for device-specific loop images
Bug: 144974129
Test: Manual - Testing OTA and Factory Reset
1) Tested with matching device name ({devicename}00000.png)
2) Tested with no matching device name (uses loop00000.png default)
3) Tested with empty string device name (uses loop00000.png default)

Change-Id: I4c73af82ab8826d1a43fe193a7616bc219d536e4
2019-12-06 12:56:50 -08:00
Treehugger Robot
2a9ddbb108 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:14:58 +00:00
Xin Li
9a6db8d62d Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I630eb6403a72db8b7db6857d8c12284aa9ffa1ef
2019-12-02 21:25:01 -08:00
Tianjie Xu
8295228a79 Merge "Move misc_writer to hardare/google/pixel"
am: 21d3b89cc5

Change-Id: I031db0c335c66db5a976064995570c81e92246e0
2019-12-02 15:40:26 -08:00
Tianjie Xu
21d3b89cc5 Merge "Move misc_writer to hardare/google/pixel" 2019-12-02 23:34:11 +00:00
David Anderson
da8658b78b Merge "bootloader_message: Add a magic header to the Virtual A/B message block."
am: f78b7a7b94

Change-Id: I81378cf209b929390c88bc83e51fd1f7bfa6fcb3
2019-11-22 12:16:10 -08:00
David Anderson
f78b7a7b94 Merge "bootloader_message: Add a magic header to the Virtual A/B message block." 2019-11-22 20:02:36 +00:00
David Anderson
682d2a5db2 bootloader_message: Add a magic header to the Virtual A/B message block.
This adds a sanity check in addition to the version number in case misc
contains random bits.

Bug: 139156011
Test: manual test
Change-Id: Ie4f3731d2b1795340881c88e0c4eec9cd4432653
2019-11-20 16:23:52 -08:00
Tianjie Xu
6ca0488c4a Merge "Clear the warm_reset flag after boot is successful"
am: ca18e7fe5a

Change-Id: I6253c40ca4649f62ac8383acdbbdc712dde98609
2019-11-18 15:39:42 -08:00
Tianjie Xu
ca18e7fe5a Merge "Clear the warm_reset flag after boot is successful" 2019-11-18 23:15:43 +00:00
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
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
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
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
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
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
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
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
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
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
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
Xin Li
5854abbb43 [automerger skipped] Merge Coral/Flame into AOSP master
am: c73a97c6ee -s ours
am skip reason: change_id Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c with SHA1 cf6b4dce12 is in history

Change-Id: Ib87c586d8c444dbc786556c2e1e32c1eaa6f0c3f
2019-10-26 21:59:40 -07:00
Xin Li
c73a97c6ee Merge Coral/Flame into AOSP master
Bug: 141248619
Change-Id: If019c780684a841a87d49dcf55a6f2cfd638f69b
Merged-In: Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c
2019-10-25 10:27:44 -07:00
Josh Gao
cf6b4dce12 Merge "Use adbd_system_binaries to track adbd's dependencies."
am: e52af1a4cc

Change-Id: Ifc73de385b7d857e8d0ceb20ff7275ba27bb200c
2019-10-24 14:31:07 -07:00
Josh Gao
e52af1a4cc Merge "Use adbd_system_binaries to track adbd's dependencies." 2019-10-24 20:29:25 +00:00
George Burgess IV
37395747a8 Merge "bootable: leak less memory"
am: 19073f2067

Change-Id: I55463429524f54941b47fce9f0c318ae47993414
2019-10-23 17:22:00 -07:00
Treehugger Robot
19073f2067 Merge "bootable: leak less memory" 2019-10-24 00:03:38 +00:00
Josh Gao
a91e456fd4 Use adbd_system_binaries to track adbd's dependencies.
required doesn't propagate from apexes, so we need a separate phony
target to track adbd's dependenecies.

Test: m
Change-Id: I13977d1376de63839bf182d2cfa56b5c6c63aba9
2019-10-23 14:33:51 -07:00
George Burgess IV
1b03fc5493 bootable: leak less memory
`misc_device_` is a std::string, so it allocates and manages its own
memory. Hence, the strdup here is immediately leaked.

Caught by the static analyzer

Bug: None
Test: TreeHugger
Change-Id: Iffb1ff60f6087e470a0979d202150567272e8b1c
2019-10-23 12:09:07 -07:00
Xin Li
a5d835720a Skip QD1A.190821.011 in stage-aosp-master
Bug: 141248619
Change-Id: I3404ae5bfb5c54df05495a62cba58cd4e818b2ff
2019-10-16 15:19:11 -07:00
Nick Desaulniers
843c0bbb01 Merge "[bootable][recovery] fix -Wreorder-init-list"
am: 0d76cad830

Change-Id: Ifd6c41936ad73a55b70c037fbc21bc12f6277a58
2019-10-11 09:22:05 -07:00
Nick Desaulniers
0d76cad830 Merge "[bootable][recovery] fix -Wreorder-init-list" 2019-10-11 15:50:07 +00:00
Nick Desaulniers
1cb510d96f [bootable][recovery] fix -Wreorder-init-list
C++20 will require members in a designated initializer to be in order
unlike C99.

Bug: 139945549
Test: mm
Change-Id: I6f8d658448f7e5dd980bf95b890b15cb0aab7407
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
2019-10-10 16:33:58 -07:00