TreeHugger Robot
b7e7977ed2
Merge "Fix misconfigured recovery host test" into tm-dev am: 43d75a1da9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19659963
Change-Id: I5e03b039e59df4c0d3b3b83dbee8b4d18e8fc686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:29:32 +00:00
TreeHugger Robot
75f4ffa2cc
[automerger skipped] Merge "Fix misconfigured recovery host test" into tm-dev am: 43d75a1da9
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19659963
Change-Id: Iafa5dbeaa709bdd3c0b27cf7b232f94b2fa673b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:26:10 +00:00
Kelvin Zhang
a323fb6161
[automerger skipped] Fix misconfigured recovery host test am: 620bd456d5
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19659963
Change-Id: I604630a3fff0e3e79b9276e6c2f8d265ef5e697e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:26:08 +00:00
TreeHugger Robot
307dc622df
[automerger skipped] Merge "Fix misconfigured recovery host test" into tm-qpr-dev am: 5556cd52b5
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19659962
Change-Id: I409944f22bd7fb15d0bb3f9cfed9de75e6d95505
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:13:06 +00:00
Kelvin Zhang
2a8a69157d
[automerger skipped] Fix misconfigured recovery host test am: da426cb315
-s ours
...
am skip reason: Merged-In I13bb9595745f65a63070cf9fe030c9155f75e4d0 with SHA-1 9ce95441b2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/19659962
Change-Id: I7b3ac4ffe2d411784b218828fac83c02f01b5936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 18:13:04 +00:00
TreeHugger Robot
43d75a1da9
Merge "Fix misconfigured recovery host test" into tm-dev
2022-08-31 18:00:28 +00:00
TreeHugger Robot
5556cd52b5
Merge "Fix misconfigured recovery host test" into tm-qpr-dev
2022-08-31 17:41:38 +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
fredchiou
f2f5aa2e2e
recovery_ui:Add support for multiple connectors switch
...
Bug: 199253219
Test: display can switch in recovery
Change-Id: If58ea5423f64420db3e5bd9307194b56129d6543
Merged-In: If58ea5423f64420db3e5bd9307194b56129d6543
2022-08-31 08:36:50 +00:00
Weizhung Ding
e43c5033cb
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
Merged-In: I18c5e0f373a29b153aab038bd289eed18847f2af
2022-08-31 08:36:07 +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
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
Kelvin Zhang
39c684a71c
Fix misconfigured recovery host test
...
Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
(cherry picked from commit 9ce95441b2
)
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-08-17 18:01:18 +00:00
Kelvin Zhang
620bd456d5
Fix misconfigured recovery host test
...
Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
(cherry picked from commit 9ce95441b2
)
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-08-17 18:01:11 +00:00
Kelvin Zhang
da426cb315
Fix misconfigured recovery host test
...
Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
(cherry picked from commit 9ce95441b2
)
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
2022-08-17 18:01:02 +00: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