Bill Yi
101c34a18b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I13caff58bd6e18556e24267d690236f0406c0d98
2022-09-02 23:20:45 -07:00
Treehugger Robot
7de4dc1a86
Merge "Make libbootloader_message available in recovery" am: 2349b3c1b5
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2199258
Change-Id: I6be24fe645fdc1bcfc3735b0f6e51fa923f1bf05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 20:09:24 +00:00
Treehugger Robot
2349b3c1b5
Merge "Make libbootloader_message available in recovery"
2022-09-02 19:25:28 +00:00
Kelvin Zhang
6f68964a57
Make libbootloader_message available in recovery
...
Test: th
Bug: 227536004
Change-Id: Ie40045963c5493d8fbc1eb15e6a54ecaf1c4728f
2022-08-31 16:28:43 +00:00
Fred Chiou
5a3219c41f
Merge "recovery_ui:Add support for multiple connectors switch" am: 91688b36bb
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2146827
Change-Id: I05360520fb299fb8413238278758c7aa5aecb881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 09:09:46 +00:00
Fred Chiou
91688b36bb
Merge "recovery_ui:Add support for multiple connectors switch"
2022-08-30 08:45:37 +00:00
fredchiou
b44702a80a
recovery_ui:Add support for multiple connectors switch
...
Bug: 199253219
Test: display can switch in recovery
Change-Id: If58ea5423f64420db3e5bd9307194b56129d6543
2022-08-29 13:16:29 +00:00
Treehugger Robot
56b4f0b779
Merge "minui: Add API to support multiple connectors detection" am: ece44b945b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2188757
Change-Id: I42eb412b5e2100b3c70bd6e5dc913fe8d08dee7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 06:22:59 +00:00
Treehugger Robot
ece44b945b
Merge "minui: Add API to support multiple connectors detection"
2022-08-26 06:08:51 +00:00
Yifan Hong
fa1855a52a
Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a43
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186991
Change-Id: I4632edeb674f19702021494af82a30d3c7916948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 18:36:16 +00:00
Yifan Hong
512edf4a43
Merge "Make recovery/fastbootd USB VID/PID configurable."
2022-08-25 18:08:14 +00:00
Josh Gao
c40208c59f
Make recovery/fastbootd USB VID/PID configurable.
...
Vendors are assigned their own USB vendor/product IDs for products by
the USB Implementers Forum. When booting from system, these are set
by the USB gadget HAL, but recovery has its USB gadgets configured via
init.rc, so there's no good way to configure these without copy/pasting
the init.rc and having to check whether it changed in every new Android
release. Add system properties to let vendors customize the recovery
USB IDs to make this easier.
Test: `adb reboot fastboot && fastboot wait-for-device && lsusb -d 18d1:`
Change-Id: I015a4c13c956b76972785fb38d45611bed27d4f4
2022-08-25 04:48:59 +00:00
Weizhung Ding
afd0a1b666
minui: Add API to support multiple connectors detection
...
Add API to support multiple connectors detection
Bug: 227468133
Test: check log in recovery mode
Change-Id: I18c5e0f373a29b153aab038bd289eed18847f2af
2022-08-18 15:28:49 +08:00
Xin Li
266e0ce537
Merge "DO NOT MERGE - Merge Android 13"
2022-08-16 19:08:21 +00:00
Xin Li
797d7d2b95
DO NOT MERGE - Merge Android 13
...
Bug: 242648940
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
Change-Id: I284bec1aa8415d2fe6c0be635a23f5c3fdf45fad
2022-08-15 21:59:09 -07:00
Treehugger Robot
ce0b24454e
Merge "Fix misconfigured recovery host test" am: 0f5c9f376b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2175232
Change-Id: I909156ba395f33f41c00bd17fbcb1664f6a22a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 19:59:30 +00:00
Treehugger Robot
0f5c9f376b
Merge "Fix misconfigured recovery host test"
2022-08-05 19:24:53 +00:00
Kelvin Zhang
9ce95441b2
Fix misconfigured recovery host test
...
Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-08-04 10:05:43 -07:00
Bill Yi
3a286d5fb0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a3e640c8d316a092d2ab34bb12c0d3184025e5f
2022-07-03 13:53:37 -07:00
Treehugger Robot
cfeb1b9b9a
Merge "Update static libs deps in recovery" am: c685fe9be8
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2061259
Change-Id: I56c9f0572212a20acaf01e426c97ee02b144a361
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:42:20 +00:00
Treehugger Robot
c685fe9be8
Merge "Update static libs deps in recovery"
2022-06-30 00:15:42 +00:00
Xin Li
3d82b087ff
Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master
2022-06-29 21:21:49 +00:00
Treehugger Robot
819c91a522
Merge "Convert recovery to use AIDL bootcontrol HAL" am: ab532fdfc7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2135412
Change-Id: Ie4637afb2076cff47cbd03850274bc1d90cc19a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 17:10:57 +00:00
Treehugger Robot
ab532fdfc7
Merge "Convert recovery to use AIDL bootcontrol HAL"
2022-06-29 16:38:58 +00:00
Xin Li
82c91a626b
Merge tm-dev-plus-aosp-without-vendor@8763363
...
Bug: 236760014
Merged-In: I28ab4357c9ac3e088776f92a0e1f7d390b4b0bdc
Change-Id: I9b4fcc9e25b097b4a3eaddb1772ac4ff191249a1
2022-06-28 21:23:05 +00:00
Kelvin Zhang
58bbe3c959
Update static libs deps in recovery
...
Transitive dependency, need to add lz4 as static lib.
Test: th
Bug: 228478555
Change-Id: Ic73ad115c2def057f1e1bcb84b8bed8cdc08c1e6
2022-06-28 12:05:05 -07:00
Florian Mayer
1671d67b94
Merge "[MTE] Reset memtag message on factory reset." am: a2a93106b7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2134979
Change-Id: Iec72218768552697581055d78d1f52ce6504bc9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 18:47:30 +00:00
Florian Mayer
a2a93106b7
Merge "[MTE] Reset memtag message on factory reset."
2022-06-28 18:21:12 +00:00
Florian Mayer
21d50b280f
[MTE] Reset memtag message on factory reset.
...
Bug: 235255174
Test: https://gist.github.com/fmayer/8900b52636574ee079fa1943e5da918e
Change-Id: If42faa0417f9717d66eaa4247a88de61985b21b0
2022-06-23 13:39:22 -07:00
Baligh Uddin
f0b82ceab2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8f7da713e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19040709
Change-Id: Ib21407a03c29faa6865a3f9da8e9c1ae5f4b4447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 18:13:26 +00:00
Baligh Uddin
8f7da713e4
Import translations. DO NOT MERGE ANYWHERE
...
Change-Id: I4af0e47335c834694ee18201e11d09bf0e302477
2022-06-23 16:43:25 +00:00
Kelvin Zhang
fa554fed44
Convert recovery to use AIDL bootcontrol HAL
...
Test: th
Bug; 227536004
Change-Id: I14c0c337c931d10c9b9865a1c15eaff8fedf191e
2022-06-22 14:46:05 -07:00
Florian Mayer
260aca6c76
Merge "Add MISC_MEMTAG_MODE_MEMTAG_OFF." am: 6adffc35b6
am: 8ebd36dd63
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2125599
Change-Id: Ia3bebdd9f40ef3c6027d4954ebc84637fbd1c83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:39:37 +00:00
Florian Mayer
8ebd36dd63
Merge "Add MISC_MEMTAG_MODE_MEMTAG_OFF." am: 6adffc35b6
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2125599
Change-Id: Idb37b725c41b4082371702894d257b904c379ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:11:16 +00:00
Florian Mayer
6adffc35b6
Merge "Add MISC_MEMTAG_MODE_MEMTAG_OFF."
2022-06-22 17:55:18 +00:00
Treehugger Robot
1e88183502
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 9d6ba81589
-s ours am: 0a0cf0e8e7
-s ours
...
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2130172
Change-Id: I131a8935257e8da0367edf222e49f0d3100cc285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:28:14 +00:00
Xin Li
ff7d4a3eb4
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c8705
-s ours am: 8330ca8c4e
-s ours
...
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2130172
Change-Id: Ia1f087610de6b4bd448d9a989cb162d384dc9adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 21:27:25 +00:00
Treehugger Robot
0a0cf0e8e7
[automerger skipped] Merge "DO NOT MERGE - Skip SQ3A.220605.009" am: 9d6ba81589
-s ours
...
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2130172
Change-Id: I7dc334fb86be1e1d5ad6f1a37117dd23ebc992b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:07:20 +00:00
Xin Li
8330ca8c4e
[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: b8042c8705
-s ours
...
am skip reason: Merged-In I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc with SHA-1 0f3b76b764
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2130172
Change-Id: I43bf7569480b689d239a2022335bf633e84bd69b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:06:28 +00:00
Treehugger Robot
9d6ba81589
Merge "DO NOT MERGE - Skip SQ3A.220605.009"
2022-06-17 14:29:01 +00:00
Xin Li
b8042c8705
DO NOT MERGE - Skip SQ3A.220605.009
...
Bug: 236045730
Merged-In: I1a3e3f0be9b79ec4c309be8e257afbacd1336cdc
Change-Id: Ib017b0dfa357aaeabd24d7b0f44059b804de36ae
2022-06-16 22:50:38 -07:00
Treehugger Robot
729a613431
Merge "Adding adbd module OWNERS for minadbd compilation unit as well." am: 3dbcd4bfd7
am: c50c43c85d
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2123773
Change-Id: I7d1a49e9e62fd90b6cc3dde9f5bb584ab46a7f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:26:10 +00:00
Treehugger Robot
c50c43c85d
Merge "Adding adbd module OWNERS for minadbd compilation unit as well." am: 3dbcd4bfd7
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2123773
Change-Id: I264a7c5df3ccc57e357958af3af0589fdc2d0b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 00:55:48 +00:00
Florian Mayer
29ace0ba4c
Add MISC_MEMTAG_MODE_MEMTAG_OFF.
...
This can be used as a killswitch to disable MTE from userspace.
Change-Id: I28ab4357c9ac3e088776f92a0e1f7d390b4b0bdc
2022-06-15 00:02:16 +00:00
Treehugger Robot
3dbcd4bfd7
Merge "Adding adbd module OWNERS for minadbd compilation unit as well."
2022-06-14 23:19:36 +00:00
Shaju Mathew
7a4ba1956a
Adding adbd module OWNERS for minadbd compilation unit as well.
...
Test: N/A (applicable only for source management).
Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I644993fb09f1aa9b983b3eab94ed16826a1df39d
2022-06-13 23:31:09 +00:00
Treehugger Robot
43995f88c9
Merge "Track API change." am: 8318e3087b
am: 305cc54c0b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382
Change-Id: Ica404973a5f4ce9093bfabe27afe50dde98891a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 18:11:25 +00:00
Treehugger Robot
305cc54c0b
Merge "Track API change." am: 8318e3087b
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1955382
Change-Id: I99c19dbd03f9bbc459538040d1b1ab5cae015c91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 17:41:18 +00:00
Treehugger Robot
8318e3087b
Merge "Track API change."
2022-06-13 17:14:01 +00:00
Treehugger Robot
c1d2c3514c
Merge "Fix logical bugs around access() POSIX call" am: e50efc781a
am: f6f84d04b2
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2118747
Change-Id: I76850b86e6e4a207492a6101488a789f6d3087f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 23:45:21 +00:00