Automerger Merge Worker
494d2ef710
Merge "Delete VINTF compatibility check during OTA." am: cae99c43de am: 567ae2f9e1 am: 9d090b2ca6
...
Change-Id: I1737066e72ac821759f0f2d1af41b9e025bf9719
2019-12-18 23:53:59 +00:00
Automerger Merge Worker
9d090b2ca6
Merge "Delete VINTF compatibility check during OTA." am: cae99c43de am: 567ae2f9e1
...
Change-Id: I40359f387e70e8055c12d0245a0e5d2132007889
2019-12-18 23:40:54 +00:00
Yifan Hong
567ae2f9e1
Merge "Delete VINTF compatibility check during OTA."
...
am: cae99c43de
Change-Id: I8ec2ee4efdadf39dd1543c1929e5e9bb11500a8e
2019-12-18 15:19:40 -08:00
Yifan Hong
cae99c43de
Merge "Delete VINTF compatibility check during OTA."
2019-12-18 23:15:51 +00:00
Yifan Hong
c77bb70166
Delete VINTF compatibility check during OTA.
...
Test: sideload OTA
Bug: 139300422
Change-Id: I3369b69242ccd7a64540a0c2d754a5d6fc50d072
2019-12-18 12:14:50 -08:00
Automerger Merge Worker
052a863342
Merge "Do not execute linkerconfig from recovery" am: b12e54c4f1 am: 7a0a80ea28 am: 0c6c04c64d
...
Change-Id: I434a509b4843b991f3a3abebac1a0a9fe8adfbe5
2019-12-18 01:28:29 +00:00
Automerger Merge Worker
0c6c04c64d
Merge "Do not execute linkerconfig from recovery" am: b12e54c4f1 am: 7a0a80ea28
...
Change-Id: I60d2cfb4dc83c35820457f4f1b7646a01acf4edd
2019-12-18 01:13:39 +00:00
Kiyoung Kim
7a0a80ea28
Merge "Do not execute linkerconfig from recovery"
...
am: b12e54c4f1
Change-Id: Ica8a524984cc85a05c23a03133693586cb7e4f80
2019-12-17 17:01:34 -08:00
Kiyoung Kim
b12e54c4f1
Merge "Do not execute linkerconfig from recovery"
2019-12-18 00:55:03 +00:00
Kiyoung Kim
ea2b683f6e
Do not execute linkerconfig from recovery
...
Linkerconfig binary itself should be built as static, so size of
executable is hard to be reduced. However, this used lots of space from
recovery so only small space left in it. To avoid this linker config
from recovery should be generated within build time and use prebuilt
one. Prebuilt ld.config.txt will be located under /system/etc as before,
and init will copy the file into /linkerconfig so we can use same
location for both recovery and normal boot.
Bug: 146384333
Test: m -j passed && crosshatch bootloader worked with this change
Change-Id: I96300f1c8301167234787274820086a4c6ea0e6e
2019-12-17 15:05:54 +09:00
Automerger Merge Worker
a6418625c6
Merge "minui: add ARGB_8888 format" am: 38f07f0ba4 am: 305417d49e am: 802e7bfd76
...
Change-Id: I2a33ca716a4a8cd9bc823ee9da95fbc918c70bb9
2019-12-14 00:22:03 +00:00
Automerger Merge Worker
802e7bfd76
Merge "minui: add ARGB_8888 format" am: 38f07f0ba4 am: 305417d49e
...
Change-Id: I41d8a7aca74f434a4740a6e60e36113cc56acb31
2019-12-13 23:56:23 +00:00
Adrian Salido
305417d49e
Merge "minui: add ARGB_8888 format"
...
am: 38f07f0ba4
Change-Id: I76d13dd351f708c385a84280403cf21f910be9c1
2019-12-13 15:47:27 -08:00
Treehugger Robot
38f07f0ba4
Merge "minui: add ARGB_8888 format"
2019-12-13 23:44:50 +00:00
Adrian Salido
cc7b7eb737
minui: add ARGB_8888 format
...
Minui currently really only supports composing in 2 different formats
(see gr_color()) with ALPHA always as MSB. However, some devices
interpret PixelFormat as either Big Endian (i.e. ARGB has alpha at MSB)
or Little Endian (i.e. BGRA has alpha at MSB).
This change attempts to give multiple options to specify the same format
depending on device interpretation, while keeping just 2 different
composition formats supported by minui.
* ARGB + BGRA: Pixels have (A)lpha at MSB and (B)lue at LSB
* RGBX + ABGR: Pixels have (A)lpha at MSB and (R)ed at LSB
With this in mind, limiting the use of png_set_bgr() to happen only for
(ARGB/BGRA) combination while leaving (RGBX/ABGR) unchanged.
Bug: 143480444
Test: Boot device with TARGET_RECOVERY_PIXEL_FORMAT := <<all>>
Change-Id: Ia0f94ccbc564b8def7c9416483712ff1abbbf49a
2019-12-13 10:53:33 -08:00
Automerger Merge Worker
9de640f8bc
Merge "Generate linker config from recovery init" am: 17090d7f53 am: c3b430d816 am: b0f5432a16
...
Change-Id: I5537fbb4a8887e343f17c88c24c27d8a0d4ae0e3
2019-12-13 02:38:25 +00:00
Automerger Merge Worker
b0f5432a16
Merge "Generate linker config from recovery init" am: 17090d7f53 am: c3b430d816
...
Change-Id: I77454f6071430e5c31093bd3ea3c7dc11a052a81
2019-12-13 01:59:33 +00:00
Kiyoung Kim
c3b430d816
Merge "Generate linker config from recovery init"
...
am: 17090d7f53
Change-Id: I6c0c59370478da3c57e0971be89fadbc4a856416
2019-12-12 17:13:50 -08:00
Kiyoung Kim
17090d7f53
Merge "Generate linker config from recovery init"
2019-12-13 01:09:58 +00:00
Kiyoung Kim
3a88a1748b
Generate linker config from recovery init
...
Generate linker config from recovery init to be used from recovery
processes.
Bug: 139638519
Test: Tested from crosshatch
Change-Id: I777a8baf08254b07375b8039bb252864637e29e7
2019-12-12 14:40:37 +09:00
Tianjie Xu
f552eceec1
Merge "Revert "Add mechanism for device-specific loop images"" am: fff38d9446 am: df59e19ca3
...
am: 1c194f2a81
Change-Id: Id4d83094f00bc424278ac5811676cc0ca8b7233e
2019-12-09 14:41:30 -08:00
Tianjie Xu
1c194f2a81
Merge "Revert "Add mechanism for device-specific loop images"" am: fff38d9446
...
am: df59e19ca3
Change-Id: I4a1953e72c1e63082bc89844930c9482dba97ce7
2019-12-09 14:38:57 -08:00
Tianjie Xu
df59e19ca3
Merge "Revert "Add mechanism for device-specific loop images""
...
am: fff38d9446
Change-Id: Ia86a156bbb90c39edf470b04892842bb27251348
2019-12-09 14:36:27 -08:00
Tianjie Xu
fff38d9446
Merge "Revert "Add mechanism for device-specific loop images""
2019-12-09 22:33:15 +00:00
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
Tianjie Xu
517c86e68a
Merge "Add mechanism for device-specific loop images" am: d81bb36b5b am: 5446037552
...
am: f165c5c4be
Change-Id: Iad6d72f2d7eae27f593165cf8e994ec291970a90
2019-12-06 14:58:34 -08:00
Tianjie Xu
f165c5c4be
Merge "Add mechanism for device-specific loop images" am: d81bb36b5b
...
am: 5446037552
Change-Id: I5c3afdc9453e9c06fb7f6a51af2503905e83ac9f
2019-12-06 14:56:03 -08:00
Tianjie Xu
5446037552
Merge "Add mechanism for device-specific loop images"
...
am: d81bb36b5b
Change-Id: I12e9dc1f21185040bdae10fa5c63e08f3cfccb9a
2019-12-06 14:53:32 -08:00
Tianjie Xu
d81bb36b5b
Merge "Add mechanism for device-specific loop images"
2019-12-06 22:46:01 +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
Automerger Merge Worker
f08ecf44a1
Merge "Merge Android10 QPR1 into AOSP master" am: 2a9ddbb108 am: 9cc8880f6e
...
Change-Id: Idc43039d398b2b9782ead62a3214cde439c937fb
2019-12-04 16:57:41 +00:00
Xin Li
9cc8880f6e
Merge "Merge Android10 QPR1 into AOSP master" am: 2a9ddbb108
...
am: 5af5b037db
Change-Id: Ia6ef910a5d17f1cf28e80503d2f9e12103350ca0
2019-12-04 08:07:30 -08:00
Xin Li
5af5b037db
Merge "Merge Android10 QPR1 into AOSP master"
...
am: 2a9ddbb108
Change-Id: I2adee5408e91984a7bbd357a7b925155c496c028
2019-12-03 16:07:23 -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
8c1e2f2425
Merge "Move misc_writer to hardare/google/pixel" am: 21d3b89cc5 am: 8295228a79
...
am: 1ebc897872
Change-Id: I7e083a054d472b5730a80e814d9204c87eeca7d5
2019-12-02 15:52:08 -08:00
Tianjie Xu
1ebc897872
Merge "Move misc_writer to hardare/google/pixel" am: 21d3b89cc5
...
am: 8295228a79
Change-Id: Iaa38917e84f6ce47054fb1b6b5f952d91aa8b90f
2019-12-02 15:45:02 -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
6199cb2aa8
Merge "bootloader_message: Add a magic header to the Virtual A/B message block." am: f78b7a7b94 am: da8658b78b
...
am: 1c4c878740
Change-Id: I1695e2b4d6f05cf0e9eba9ed0f7da11f53c193ae
2019-11-22 12:25:12 -08:00
David Anderson
1c4c878740
Merge "bootloader_message: Add a magic header to the Virtual A/B message block." am: f78b7a7b94
...
am: da8658b78b
Change-Id: I18f6a1a71df38fc6ae6347830a27d6f5dddc3287
2019-11-22 12:22:11 -08: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
7d00475162
Merge "Clear the warm_reset flag after boot is successful" am: ca18e7fe5a am: 6ca0488c4a
...
am: f6c107d1ea
Change-Id: Idf0656eb88c1a5db992d3a6ebfe719075071aaf8
2019-11-18 15:55:12 -08:00
Tianjie Xu
f6c107d1ea
Merge "Clear the warm_reset flag after boot is successful" am: ca18e7fe5a
...
am: 6ca0488c4a
Change-Id: If68e37558967a323705ba9b229ed64ca553ae21f
2019-11-18 15:43:13 -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
b72291bd20
Merge "Force merges to complete before wiping data or metadata." am: 8444dec7ac am: bc4b39efff
...
am: 49c03e1bab
Change-Id: Ibb9a2c341982e8d39a5163e527472b5faf526d73
2019-11-14 20:46:34 -08:00
David Anderson
49c03e1bab
Merge "Force merges to complete before wiping data or metadata." am: 8444dec7ac
...
am: bc4b39efff
Change-Id: Iac20a6d65d48b2014aea4d118d730e933950e2e1
2019-11-14 20:42:33 -08:00