Commit graph

11209 commits

Author SHA1 Message Date
Xin Li
e640c58732 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 76dff2b45b -s ours am: 1efb8613ef -s ours am: 442fd1e95a -s ours
am skip reason: Merged-In I14709252f2cd771891cfacbbba7ce4372c78efa9 with SHA-1 36956e3bb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22725844

Change-Id: I7d7aac2d711095643d2a1ed6a7b09866f41b2a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:11:48 +00:00
Xin Li
442fd1e95a [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 76dff2b45b -s ours am: 1efb8613ef -s ours
am skip reason: Merged-In I14709252f2cd771891cfacbbba7ce4372c78efa9 with SHA-1 36956e3bb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22725844

Change-Id: I9539d29a088be7629600438f2084f533bd837877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:02 +00:00
Xin Li
1efb8613ef [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 76dff2b45b -s ours
am skip reason: Merged-In I14709252f2cd771891cfacbbba7ce4372c78efa9 with SHA-1 36956e3bb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22725844

Change-Id: I4437cd70337ad09a256b560cfbd76e7169c24abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:11 +00:00
Xin Li
76dff2b45b Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994
Bug: 275386652
Merged-In: I14709252f2cd771891cfacbbba7ce4372c78efa9
Change-Id: Id30afd0dfafba9d57bb32f238a98aee5cff62d91
2023-04-18 16:31:48 -07:00
Roy Luo
ccb2ecc0e0 Merge "Configure USB gadget maximum power" am: 772939db8b am: db04d6a1e9 am: 66f35e60a5 am: a5b62f3dbe
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019

Change-Id: I32c38dc2ad85fb9d98e47df6afa9e15e79056597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 09:55:38 +00:00
Roy Luo
a5b62f3dbe Merge "Configure USB gadget maximum power" am: 772939db8b am: db04d6a1e9 am: 66f35e60a5
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019

Change-Id: I78454333158abe0f9f745d17a6c611472e82dd20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 09:24:36 +00:00
Roy Luo
66f35e60a5 Merge "Configure USB gadget maximum power" am: 772939db8b am: db04d6a1e9
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019

Change-Id: I01d58a5b5d9f1dc54863f92420c8e014fa4d89ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 08:53:48 +00:00
Roy Luo
db04d6a1e9 Merge "Configure USB gadget maximum power" am: 772939db8b
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2525019

Change-Id: I759fb17d25a36a1e118076f32d60ccd7f986852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-06 08:23:59 +00:00
Roy Luo
772939db8b Merge "Configure USB gadget maximum power" 2023-04-06 08:00:18 +00:00
Roy Luo
fe37b5ebbc Configure USB gadget maximum power
The default 2mA would be applied if the field is left
unconfigured. Configure the gadget to use full power.

Test: boot to userspace fastbootd and recovery
Bug: 277022505
Change-Id: I18abd98b62f5ce8d35062debad8100d87140bdba
2023-04-06 00:27:51 +00:00
TreeHugger Robot
74af5d2fae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 195b069b7a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22424667

Change-Id: I2e1de177aade81c60a196294aea92307d3f347a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 07:55:00 +00:00
Bill Yi
57ed70bfff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 737b3c4ed6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22424667

Change-Id: I97b15d45b595536df09670840a71cd5281dcf30b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-04 07:54:53 +00:00
TreeHugger Robot
195b069b7a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 06:36:38 +00:00
TreeHugger Robot
47720fb192 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-04 00:02:00 +00:00
Bill Yi
63b83d6736 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ceb7924c43 am: 805207a762 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22424666

Change-Id: Ie1d6b599362a0d89b219c1e8c909948abb5d8236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 21:25:37 +00:00
Bill Yi
805207a762 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ceb7924c43
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22424666

Change-Id: I1441b2b6b95b1ce96b094a61db8c15fcfd55fea7
2023-04-03 14:34:22 +00:00
Bill Yi
737b3c4ed6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6fa10c9cade5a3de7a85e34789d13f1e6c4aad60
2023-04-02 17:26:37 -07:00
Bill Yi
ceb7924c43 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifc8e7c02c287f3e82f103e41638a7f1ae4d16d10
2023-04-02 17:26:00 -07:00
Bill Yi
f5fd782e81 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I937aaf3bd39396df4eab0ef76a8a96bcc86c494d
2023-04-02 15:58:15 -07:00
Bill Yi
42b56fd616 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36956e3bb8 -s ours am: 875c09e85f -s ours am: 5f51dd70b0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22391284

Change-Id: I34cb67cd4a35e136b88994e26b2bb0ca233125f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-02 05:07:02 +00:00
Bill Yi
5f51dd70b0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36956e3bb8 -s ours am: 875c09e85f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22391284

Change-Id: I8e2b5d13d7902a27697ab814d3411a4b795d4cf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-02 04:41:04 +00:00
Bill Yi
875c09e85f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36956e3bb8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/22391284

Change-Id: Icac43b64c33ba49f501225bf1250562860f810c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-02 04:25:57 +00:00
Bill Yi
36956e3bb8 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I14709252f2cd771891cfacbbba7ce4372c78efa9
2023-03-31 16:46:15 -07:00
Treehugger Robot
90c3c9104f Merge "Add ZSTD dependency for recovery" am: d97f317e0d am: 9a6e61051c am: 935ccea458 am: 4b0f87aed2
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633

Change-Id: I22e131343d5c1a9812a8ef41b41708d9aaafcb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 21:33:12 +00:00
Treehugger Robot
4b0f87aed2 Merge "Add ZSTD dependency for recovery" am: d97f317e0d am: 9a6e61051c am: 935ccea458
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633

Change-Id: I802fd87c3651f64134b8ff2e02e0762f665bc925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 20:54:29 +00:00
Treehugger Robot
935ccea458 Merge "Add ZSTD dependency for recovery" am: d97f317e0d am: 9a6e61051c
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633

Change-Id: Ia94873c92de074dace8a8c58a176190505ce0c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 20:15:41 +00:00
Treehugger Robot
9a6e61051c Merge "Add ZSTD dependency for recovery" am: d97f317e0d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2439633

Change-Id: I57ebdcc415bdf0a124aba447a16005f2a315f682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:40:33 +00:00
Treehugger Robot
d97f317e0d Merge "Add ZSTD dependency for recovery" 2023-03-17 18:55:07 +00:00
Kelvin Zhang
04a9449c30 Add ZSTD dependency for recovery
In prepartion for adding ZSTD support to OTA.

Bug: 274129758

Change-Id: I036a6a21eaac2eb5b31aaec072f2eb28bbc622aa
2023-03-17 17:23:30 +00:00
Treehugger Robot
af0a2636f9 Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec am: 2f5744f57e am: 2643880e5d am: 3d576c758f
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129

Change-Id: I6ac446267f2167704b421173d21a63695f3dbb5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 05:34:39 +00:00
Treehugger Robot
3d576c758f Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec am: 2f5744f57e am: 2643880e5d
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129

Change-Id: Iea29567176394255efe51ca4cc59c45639d07175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 04:56:31 +00:00
Treehugger Robot
2643880e5d Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec am: 2f5744f57e
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129

Change-Id: Ifa99533458d7a01e2a0a736ef2929f220adce9b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 04:17:35 +00:00
Treehugger Robot
2f5744f57e Merge "Allow brick OTA package to be sideloaded in recovery" am: aff08259ec
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486129

Change-Id: I14bd01d88930021d2c9f074016616daabf5ac39f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 03:41:05 +00:00
Treehugger Robot
aff08259ec Merge "Allow brick OTA package to be sideloaded in recovery" 2023-03-15 02:55:18 +00:00
Kelvin Zhang
12c089fdd8 Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128f9 am: 421625f458 am: d528b41591 am: b93ca40c49
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486120

Change-Id: I5eb7b0a41a23c174333e4cf8aeaaa6a0507e5fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 02:20:13 +00:00
Kelvin Zhang
b93ca40c49 Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128f9 am: 421625f458 am: d528b41591
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486120

Change-Id: I7a754dbb877bb4eb4662903e9315afa24724189c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:36:47 +00:00
Kelvin Zhang
d528b41591 Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128f9 am: 421625f458
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486120

Change-Id: Iaa057500b6fd0dd67caee2dd3b45f2ca953b4060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 01:00:26 +00:00
Kelvin Zhang
421625f458 Merge "Require serialno field for brick OTA package on release-key devices" am: 00bfe128f9
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2486120

Change-Id: I58087c7e132a714cdedf3984906e49f78e233b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 00:20:45 +00:00
Kelvin Zhang
170ad59954 Allow brick OTA package to be sideloaded in recovery
Makes testing easier, brick packaegs can now be tested directly in
recovery w/o having to go through GOTA.

Test: adb sideload brick_ota.zip
Bug: 273561331
Change-Id: I48214dc03e63b69e61fc217bc3f58923bb90a9a6
2023-03-14 17:10:42 -07:00
Kelvin Zhang
00bfe128f9 Merge "Require serialno field for brick OTA package on release-key devices" 2023-03-14 23:42:36 +00:00
Kelvin Zhang
2a8c6e0842 Require serialno field for brick OTA package on release-key devices
Bug: 273561331
Test: th
Change-Id: Ifba030dca61275bb05bc5a8b62413830d28ba2d4
2023-03-14 12:29:52 -07:00
Jaewan Kim
1176f62ec5 Merge "Stop mentioning about ALLOW_ADBD_NO_AUTH" am: 19e9af0a99 am: 6f24f52f79 am: 89ece764fe am: 8f6bf76091
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2477204

Change-Id: Iead85411793f3ffd07b90e1403b2327b8cda3c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 19:43:50 +00:00
Jaewan Kim
8f6bf76091 Merge "Stop mentioning about ALLOW_ADBD_NO_AUTH" am: 19e9af0a99 am: 6f24f52f79 am: 89ece764fe
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2477204

Change-Id: If49c73baa744139b619b37fd0913aa0b43b67a4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 19:08:00 +00:00
Jaewan Kim
89ece764fe Merge "Stop mentioning about ALLOW_ADBD_NO_AUTH" am: 19e9af0a99 am: 6f24f52f79
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2477204

Change-Id: I96fa04320210deae914d1a22ed37abbac6971445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 18:33:55 +00:00
Jaewan Kim
6f24f52f79 Merge "Stop mentioning about ALLOW_ADBD_NO_AUTH" am: 19e9af0a99
Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2477204

Change-Id: I4ab6209dd454424ad149a7275b9e2e7e7623ba9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 17:59:56 +00:00
Jaewan Kim
19e9af0a99 Merge "Stop mentioning about ALLOW_ADBD_NO_AUTH" 2023-03-08 17:34:24 +00:00
Elliott Hughes
a3954457b0 Stop mentioning about ALLOW_ADBD_NO_AUTH
ALLOW_ADBD_NO_AUTH is removed, so better not mention it.

Test: Build
Change-Id: Id9d730475165a38cf340e10febffe2e5a9da6725
2023-03-08 16:00:37 +00:00
Bill Yi
54573cb120 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 643d8b4bf9 -s ours am: 75487a6670 -s ours am: dd6b01942a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/21604884

Change-Id: I41eab3490336538b96545d79636d47ae347dc48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:30:39 +00:00
Bill Yi
dd6b01942a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 643d8b4bf9 -s ours am: 75487a6670 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/21604884

Change-Id: If8dafb9ef7982bd89407342a1e35efa12165d03c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:13:44 +00:00
Bill Yi
75487a6670 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 643d8b4bf9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/bootable/recovery/+/21604884

Change-Id: I2e34c9471b34a0d291eb02a403fcfbe2f26cfeb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 05:10:59 +00:00