Bill Yi
d7e776f6a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a8fcbf7efc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I237c86cae7d44b0904eb0fa45ab570e74b30a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 02:15:36 +00:00
Fred Chiou
b24de2ad56
Merge "recovery_ui:Add support for multiple connectors switch" am: 91688b36bb
am: 5a3219c41f
am: fa3dd4dd49
am: ca111c6906
am: 1e85c6b0e8
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2146827
Change-Id: I5fb83d88c1ff65d6e1cbdf7b206ff408e0284936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-30 12:13:57 +00:00
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
89ddd70382
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: 0f2cd4b915
-s ours am: 86ab8d23b7
-s ours am: 0186de0b12
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I439c2ef0b82b79bc90e5163dc611587c55821bde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 03:43:14 +00:00
Bill Yi
2f64641f1d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a4a9ad3e99
-s ours am: efa2100268
-s ours am: 7b389b9c64
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I4331319747df6a46bec9b401c90cd6450a103d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 03:39:43 +00:00
Bill Yi
2f32466cea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9aebac2722
-s ours am: a4a9ad3e99
-s ours am: 281598b074
-s ours am: c4a9c6f9d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738765
Change-Id: I45434010ddfbd56aac58c8b078281dacb23b4147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 03:26:53 +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
a8fcbf7efc
[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: Idce35d6ecafbcaeecbf5ed3dcca5810f67d771c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-28 02:23:54 +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
Bill Yi
26996b4554
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-08-28 00:23:58 +00:00
Automerger Merge Worker
0abfdda934
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours am: 5c084da2de
-s ours" into tm-qpr-dev-plus-aosp am: f6c5992c23
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: Ia7aad9ae408bc998310205ec21577b07506b530f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:28:20 +00:00
Bill Yi
f25b07c7c2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours am: 5c084da2de
-s ours am: a15785d5c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: If856bf406141e34174335d56b5be53f7608f2c40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:28:06 +00:00
Bill Yi
3f7691c32d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fa66bbb0a
-s ours am: 3fe1c780d6
-s ours am: 7cd50e4284
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738767
Change-Id: I84b778790a07e4fbad7da61533967644183ae946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-27 22:23:34 +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
TreeHugger Robot
3cbed9a3aa
Merge changes from topic "tc_change_22082515_37"
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac88c1d338
Import translations. DO NOT MERGE ANYWHERE
2022-08-27 08:11:48 +00:00
Bill Yi
58393d0fb5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cb5879f9de
-s ours am: 377ed97670
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738766
Change-Id: I2ed2048b8b5233640268bc834440caec007d41fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 19:21:58 +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
3074d8d3c9
Merge "minui: Add API to support multiple connectors detection" am: ece44b945b
am: 56b4f0b779
am: ce1ce7d06a
am: 1fdf619d9e
am: 5e874e33b3
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2188757
Change-Id: I682125c084168d18ed0d2c01d36f97cab5e0ac50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-26 07:39:29 +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
Bill Yi
61dc527a58
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ac88c1d338
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19738763
Change-Id: I957d3b5a09ad17ec66be3405bb6399b4851fa0b8
2022-08-25 22:40:10 +00:00
Yifan Hong
c59f83be22
Merge "Make recovery/fastbootd USB VID/PID configurable." am: 512edf4a43
am: fa1855a52a
am: 3052ef7daa
am: 2c0ea9f0ac
am: 74455ea509
...
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2186991
Change-Id: I68081fdf0f55eed1a4630eea8bbc63b0d8dc109d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25 20:33:24 +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
Bill Yi
8e60b03020
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icd2f58a71d05e462efa04df6a175665d5de60090
2022-08-25 07:55:28 -07: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