f552eceec1
Merge "Revert "Add mechanism for device-specific loop images"" am: fff38d9446 am: df59e19ca3
...
am: 1c194f2a81
2019-12-09 14:41:30 -08:00
1c194f2a81
Merge "Revert "Add mechanism for device-specific loop images"" am: fff38d9446
...
am: df59e19ca3
2019-12-09 14:38:57 -08:00
df59e19ca3
Merge "Revert "Add mechanism for device-specific loop images""
...
am: fff38d9446
2019-12-09 14:36:27 -08:00
fff38d9446
Merge "Revert "Add mechanism for device-specific loop images""
2019-12-09 22:33:15 +00:00
94a83be42a
Revert "Add mechanism for device-specific loop images"
...
This reverts commit fd6a2c226dhttps://source.android.com/devices/tech/ota/nonab/device_code#recovery-ui-images
Change-Id: Ic7b640b5d435cfb6f5c2610a2534405fb9415936
2019-12-09 20:24:18 +00:00
517c86e68a
Merge "Add mechanism for device-specific loop images" am: d81bb36b5b am: 5446037552
...
am: f165c5c4be
2019-12-06 14:58:34 -08:00
f165c5c4be
Merge "Add mechanism for device-specific loop images" am: d81bb36b5b
...
am: 5446037552
2019-12-06 14:56:03 -08:00
5446037552
Merge "Add mechanism for device-specific loop images"
...
am: d81bb36b5b
2019-12-06 14:53:32 -08:00
d81bb36b5b
Merge "Add mechanism for device-specific loop images"
2019-12-06 22:46:01 +00:00
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
f08ecf44a1
Merge "Merge Android10 QPR1 into AOSP master" am: 2a9ddbb108 am: 9cc8880f6e
...
Change-Id: Idc43039d398b2b9782ead62a3214cde439c937fb
2019-12-04 16:57:41 +00:00
9cc8880f6e
Merge "Merge Android10 QPR1 into AOSP master" am: 2a9ddbb108
...
am: 5af5b037db
2019-12-04 08:07:30 -08:00
5af5b037db
Merge "Merge Android10 QPR1 into AOSP master"
...
am: 2a9ddbb108
2019-12-03 16:07:23 -08:00
2a9ddbb108
Merge "Merge Android10 QPR1 into AOSP master"
2019-12-03 23:14:58 +00:00
9a6db8d62d
Merge Android10 QPR1 into AOSP master
...
Bug: 145570283
Change-Id: I630eb6403a72db8b7db6857d8c12284aa9ffa1ef
2019-12-02 21:25:01 -08:00
8c1e2f2425
Merge "Move misc_writer to hardare/google/pixel" am: 21d3b89cc5 am: 8295228a79
...
am: 1ebc897872
2019-12-02 15:52:08 -08:00
1ebc897872
Merge "Move misc_writer to hardare/google/pixel" am: 21d3b89cc5
...
am: 8295228a79
2019-12-02 15:45:02 -08:00
8295228a79
Merge "Move misc_writer to hardare/google/pixel"
...
am: 21d3b89cc5
2019-12-02 15:40:26 -08:00
21d3b89cc5
Merge "Move misc_writer to hardare/google/pixel"
2019-12-02 23:34:11 +00:00
6199cb2aa8
Merge "bootloader_message: Add a magic header to the Virtual A/B message block." am: f78b7a7b94 am: da8658b78b
...
am: 1c4c878740
2019-11-22 12:25:12 -08:00
1c4c878740
Merge "bootloader_message: Add a magic header to the Virtual A/B message block." am: f78b7a7b94
...
am: da8658b78b
2019-11-22 12:22:11 -08:00
da8658b78b
Merge "bootloader_message: Add a magic header to the Virtual A/B message block."
...
am: f78b7a7b94
2019-11-22 12:16:10 -08:00
f78b7a7b94
Merge "bootloader_message: Add a magic header to the Virtual A/B message block."
2019-11-22 20:02:36 +00:00
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
7d00475162
Merge "Clear the warm_reset flag after boot is successful" am: ca18e7fe5a am: 6ca0488c4a
...
am: f6c107d1ea
2019-11-18 15:55:12 -08:00
f6c107d1ea
Merge "Clear the warm_reset flag after boot is successful" am: ca18e7fe5a
...
am: 6ca0488c4a
2019-11-18 15:43:13 -08:00
6ca0488c4a
Merge "Clear the warm_reset flag after boot is successful"
...
am: ca18e7fe5a
2019-11-18 15:39:42 -08:00
ca18e7fe5a
Merge "Clear the warm_reset flag after boot is successful"
2019-11-18 23:15:43 +00:00
b72291bd20
Merge "Force merges to complete before wiping data or metadata." am: 8444dec7ac am: bc4b39efff
...
am: 49c03e1bab
2019-11-14 20:46:34 -08:00
49c03e1bab
Merge "Force merges to complete before wiping data or metadata." am: 8444dec7ac
...
am: bc4b39efff
2019-11-14 20:42:33 -08:00
bc4b39efff
Merge "Force merges to complete before wiping data or metadata."
...
am: 8444dec7ac
2019-11-14 20:38:26 -08:00
8444dec7ac
Merge "Force merges to complete before wiping data or metadata."
2019-11-15 04:27:59 +00:00
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
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
5d1f8cdc82
Merge "Consolidate the vendor space misc usage for Pixels" am: 423f0d109b am: 85808f6a69
...
am: f0f95decb3
2019-11-13 14:41:58 -08:00
f0f95decb3
Merge "Consolidate the vendor space misc usage for Pixels" am: 423f0d109b
...
am: 85808f6a69
2019-11-13 14:38:27 -08:00
85808f6a69
Merge "Consolidate the vendor space misc usage for Pixels"
...
am: 423f0d109b
2019-11-13 14:35:07 -08:00
423f0d109b
Merge "Consolidate the vendor space misc usage for Pixels"
2019-11-13 22:24:19 +00:00
26dde7e04d
Merge "Fixed typo during stopping fastboot" am: 8834b4ea0a am: cfcadc3b33
...
am: da369dd305
2019-11-13 12:40:21 -08:00
da369dd305
Merge "Fixed typo during stopping fastboot" am: 8834b4ea0a
...
am: cfcadc3b33
2019-11-13 12:36:21 -08:00
cfcadc3b33
Merge "Fixed typo during stopping fastboot"
...
am: 8834b4ea0a
2019-11-13 12:32:20 -08:00
8834b4ea0a
Merge "Fixed typo during stopping fastboot"
2019-11-13 20:18:22 +00:00
e57fdb72f2
[automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 154f7e9b79 am: 054861f9eb -s ours
...
am: 038282ddfb24dd3146e1
2019-11-13 08:21:18 -08:00
038282ddfb
[automerger skipped] Merge "Move init and ueventd scripts from / to /system/etc" am: 154f7e9b79
...
am: 054861f9eb24dd3146e1
2019-11-13 08:13:36 -08:00
054861f9eb
Merge "Move init and ueventd scripts from / to /system/etc"
...
am: 154f7e9b79
2019-11-13 08:05:59 -08:00
154f7e9b79
Merge "Move init and ueventd scripts from / to /system/etc"
2019-11-13 14:36:47 +00:00
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
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
a762387a5b
Merge "Move init and ueventd scripts from / to /system/etc" into qt-qpr1-dev-plus-aosp
...
am: e5939e8297
2019-11-12 07:57:06 -08:00
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
Tianjie Xu
Joshua Lambert
Automerger Merge Worker
Xin Li
Treehugger Robot
David Anderson
Tom Cherry
Dmytro Prokopchuk