Fred Chiou
1e85c6b0e8
Merge "recovery_ui:Add support for multiple connectors switch" am: 91688b36bb
am: 5a3219c41f
am: fa3dd4dd49
am: ca111c6906
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2146827
Change-Id: I7571bd362f02066adfc1d0cc908f246de75621ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 11:46:53 +00:00
Fred Chiou
ca111c6906
Merge "recovery_ui:Add support for multiple connectors switch" am: 91688b36bb
am: 5a3219c41f
am: fa3dd4dd49
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2146827
Change-Id: Ia46d1caeaf75c7f7b939b00d265db44f4d855006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 10:48:29 +00:00
Fred Chiou
fa3dd4dd49
Merge "recovery_ui:Add support for multiple connectors switch" am: 91688b36bb
am: 5a3219c41f
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2146827
Change-Id: Ifce779dbb0cd93d4cd52376eed8cea8d35dd3533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 09:38:40 +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
Bill Yi
0186de0b12
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: 0f2cd4b915
-s ours am: 86ab8d23b7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I7557be6c85e2786608a610b5cb4ab0416d545642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:46:06 +00:00
Bill Yi
7b389b9c64
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a4a9ad3e99
-s ours am: efa2100268
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: If0a0e44b83577931c25fd685ed05507684007637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:42:38 +00:00
Bill Yi
86ab8d23b7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: 0f2cd4b915
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I5f87221f303c706d36d7775c275f70101a347c56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:37:25 +00:00
Bill Yi
c4a9c6f9d4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a4a9ad3e99
-s ours am: 281598b074
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: Iba9406d56e99bde86a5f5583d1bbe9281669276e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:34:30 +00:00
Bill Yi
efa2100268
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a4a9ad3e99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: Ia601c82ee1c514e96550b23bf472c4eebe118173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:28:05 +00:00
Bill Yi
281598b074
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a4a9ad3e99
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I4d19590e07b051b1101a3bfa3bea3f49d4ca2cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:25:34 +00:00
Bill Yi
a4a9ad3e99
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I0b85c5e39ae8c9facf992b9fe4b187745caca39e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:21:32 +00:00
Bill Yi
0f2cd4b915
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I8755863f701e9a9a315b00ef35fee007e582271a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:18:51 +00:00
Automerger Merge Worker
f6c5992c23
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours am: 5c084da2de
-s ours" into tm-qpr-dev-plus-aosp
2022-08-27 21:55:50 +00:00
Bill Yi
a15785d5c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours am: 5c084da2de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: Iee1f26fff3bc2fb535979d9bb21c3b339d2e6663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:53:48 +00:00
Bill Yi
7cd50e4284
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours am: 3fe1c780d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: Ia4fefd5bc59abe52d5258bc0c59f440fcdf81854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:53:28 +00:00
Bill Yi
5c084da2de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: If88a0b7a670f7a51c586cafd05988bc4714f679c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:30:01 +00:00
Bill Yi
3fe1c780d6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: Ia19c59d1f5e7729279edc8bb8d37a8ecf0133259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 21:29:20 +00:00
Bill Yi
377ed97670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb5879f9de
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738766
Change-Id: If2855a85ce9bc898c659d61ef0c4cc4f54d222f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 18:54:33 +00:00
Treehugger Robot
5e874e33b3
Merge "minui: Add API to support multiple connectors detection" am: ece44b945b
am: 56b4f0b779
am: ce1ce7d06a
am: 1fdf619d9e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2188757
Change-Id: Idb47fceb68eaa3f61526f67a0f707b6c666a17b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 07:20:46 +00:00
Treehugger Robot
1fdf619d9e
Merge "minui: Add API to support multiple connectors detection" am: ece44b945b
am: 56b4f0b779
am: ce1ce7d06a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2188757
Change-Id: Ic045dcbe85d428170a9ea766ae9800eb3b33ec58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 07:02:59 +00:00
Treehugger Robot
ce1ce7d06a
Merge "minui: Add API to support multiple connectors detection" am: ece44b945b
am: 56b4f0b779
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2188757
Change-Id: I81d127918ee470abf3cc23d71c471fa4e25ddc0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 06:41:42 +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
74455ea509
Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a43
am: fa1855a52a
am: 3052ef7daa
am: 2c0ea9f0ac
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186991
Change-Id: I5ba3aa2088c72a00583907cafa6994316314187b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 20:02:56 +00:00
Yifan Hong
2c0ea9f0ac
Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a43
am: fa1855a52a
am: 3052ef7daa
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186991
Change-Id: I1258c6613840f5c7c168e36000ddde6bd22a306e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 19:44:08 +00:00
Yifan Hong
3052ef7daa
Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a43
am: fa1855a52a
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186991
Change-Id: Ic190554e31613662ade2f2182e96c0f93fd3e4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 19:23:20 +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
Bill Yi
1fa66bbb0a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I881456f8d9319947b42ead7376662b617680aa99
2022-08-24 19:45:45 -07:00
Bill Yi
cb5879f9de
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ice8bed9dcbef8c334c00f652772513936ff68911
2022-08-24 19:44:34 -07:00
Bill Yi
9aebac2722
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81ef61c2599cdd98f8cc1049c36a8deaf6283cd8
2022-08-24 19:43:19 -07: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
092016e966
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 266e0ce537
-s ours am: 7c1beee4b9
-s ours am: 121607b3ad
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186697
Change-Id: I4f55e5db4b38e064bf42a5e6d38a0554407aaccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:11:04 +00:00
Xin Li
9f5dcf1f08
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 797d7d2b95
-s ours am: 3e40380c07
-s ours am: f0735f0cb3
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186697
Change-Id: I95bbbdad590335bdf773beaaba9efcda3d20dc72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-17 00:11:02 +00:00
Xin Li
121607b3ad
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 266e0ce537
-s ours am: 7c1beee4b9
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186697
Change-Id: Ifc6a5312fe73a6fbe5eee32e4a63cc1c37000fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:41:06 +00:00
Xin Li
f0735f0cb3
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 797d7d2b95
-s ours am: 3e40380c07
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186697
Change-Id: Ia06957dbd9156889fd2c2d558c57a0f3980539d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:41:04 +00:00
Xin Li
7c1beee4b9
[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 266e0ce537
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186697
Change-Id: I23f92db83b518249c8cf4814b93ed2f736b00013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:11:53 +00:00
Xin Li
3e40380c07
[automerger skipped] DO NOT MERGE - Merge Android 13 am: 797d7d2b95
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186697
Change-Id: I6f1cc1c4c0c154bc4697191c3c79e63708c0d8f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:11:51 +00: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
252fb4cdcb
Merge "Fix misconfigured recovery host test" am: 0f5c9f376b
am: ce0b24454e
am: 628a68b765
am: af5b875a3c
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2175232
Change-Id: I561304b7f6b15c90e60f240eb8d12d745a931c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 22:06:29 +00:00
Treehugger Robot
af5b875a3c
Merge "Fix misconfigured recovery host test" am: 0f5c9f376b
am: ce0b24454e
am: 628a68b765
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2175232
Change-Id: Ia0504da31c3a55d710c36e4488b5db19472486e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 21:42:28 +00:00
Treehugger Robot
628a68b765
Merge "Fix misconfigured recovery host test" am: 0f5c9f376b
am: ce0b24454e
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2175232
Change-Id: I54e21b8503565edd39c43030b2d400d7d5826645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05 20:32:35 +00: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
TreeHugger Robot
4044fd2f98
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 164f95895f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19293775
Change-Id: Ib2c4e3551f4e23104c6a6258127583ddc5c982ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-16 06:45:33 +00:00