Commit Graph

804762 Commits

Author SHA1 Message Date
Junyu Lai
bf199e8f08 [automerger skipped] Merge "Fix crash when incrementing data usage request" am: 641d6d1795 am: e3f5ddc92b -s ours am: e3d75ae75e -s ours am: 0e6166da3d -s ours am: ce438ccede -s ours
am skip reason: Merged-In Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2 with SHA-1 6675e03317 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117275

Change-Id: I516a0642b07fd929c221d3d62152a7d0cb333b67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 12:41:44 +00:00
Tiger Huang
4a8e0a390c Merge "Don't set extreme values of Integer to safe bounds" into tm-dev am: 0a194469f0 am: 1c41f4ef93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18746081

Change-Id: Ie84a36ce9365f009db706f7e664a12f8c8f38056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 12:22:48 +00:00
Junyu Lai
ce438ccede [automerger skipped] Merge "Fix crash when incrementing data usage request" am: 641d6d1795 am: e3f5ddc92b -s ours am: e3d75ae75e -s ours am: 0e6166da3d -s ours
am skip reason: Merged-In Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2 with SHA-1 6675e03317 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117275

Change-Id: Ie9093419dd726240d1539af34befda5a9d2815c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 12:22:16 +00:00
Tiger Huang
1c41f4ef93 Merge "Don't set extreme values of Integer to safe bounds" into tm-dev am: 0a194469f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18746081

Change-Id: I67add3cf8f98d7168656991e49db1e8a817ca8f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 12:05:42 +00:00
Junyu Lai
0e6166da3d [automerger skipped] Merge "Fix crash when incrementing data usage request" am: 641d6d1795 am: e3f5ddc92b -s ours am: e3d75ae75e -s ours
am skip reason: Merged-In Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2 with SHA-1 6675e03317 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117275

Change-Id: Ifdc7ce1c85ca05561a02d5a32c7f4beb5e3d3bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 11:59:00 +00:00
Tiger Huang
0a194469f0 Merge "Don't set extreme values of Integer to safe bounds" into tm-dev 2022-06-07 11:45:29 +00:00
Junyu Lai
e3d75ae75e [automerger skipped] Merge "Fix crash when incrementing data usage request" am: 641d6d1795 am: e3f5ddc92b -s ours
am skip reason: Merged-In Icee43a4ee913a6459a47632f608fa6cb8b2ed4c2 with SHA-1 6675e03317 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117275

Change-Id: I256eebc401d1a0d4d94816d083c974564f78b262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 11:42:40 +00:00
Junyu Lai
e3f5ddc92b Merge "Fix crash when incrementing data usage request" am: 641d6d1795
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117275

Change-Id: I1803a9ac64908668196bce3d464ca5ba7ebe0529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 11:17:30 +00:00
Louis Chang
18614db0dd Merge "Reduce RippleDrawable background opacity when no window focus" 2022-06-07 10:36:54 +00:00
Junyu Lai
641d6d1795 Merge "Fix crash when incrementing data usage request" 2022-06-07 09:26:09 +00:00
Betty Chang
64ba772e5f Merge "To correct the title of the LE audio toggle in bluetooth settings" am: 7c92ca6de9 am: 2e4249a884 am: 23ad9de0a4 am: 55b0007d23 am: d7c7c2ff90
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115074

Change-Id: I2cea63627c80c84e538921b56abf62ed122077bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:09:59 +00:00
Santiago Aboy Solanes
f70b73590a Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: dc15fc2ab5 am: 1fbf7a8f08 am: 3e82da340a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I2abfd2beb5eda1a4e257f383479c525fd90fbb50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:08:18 +00:00
Santiago Aboy Solanes
ebcb075ca4 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: 9c98af4839 am: 9966b865ec am: 4932a5c9cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I4526427fb4c6bb0aaf1567d15562f620496052d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:06:21 +00:00
Jason Chang
dd9e969343 Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: b5149141aa am: 448334ed3b am: 1223f1b47b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: If78f6ea4bde20bf62f554efd4c0095171b7510d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:05:45 +00:00
Automerger Merge Worker
ab45f0f37a Merge "Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: 43e9967ee7 am: ed1474c43a" into tm-qpr-dev-plus-aosp am: cd23a4ab2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I98daea99470786959323f54e9c569be6bcd04e6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:04:38 +00:00
Santiago Aboy Solanes
37d907f8b9 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: 9c98af4839 am: 4c1edb45c5 am: 9958454247
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I2a488bc539a92a3636ada65009d382675b6ed095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:02:36 +00:00
Jason Chang
8ed770b314 Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: b5149141aa am: 230b143a5a am: 0b44732bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I9cdd642bc20c41aef963bc9d7936bd62dab6efc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:01:57 +00:00
Betty Chang
d7c7c2ff90 Merge "To correct the title of the LE audio toggle in bluetooth settings" am: 7c92ca6de9 am: 2e4249a884 am: 23ad9de0a4 am: 55b0007d23
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115074

Change-Id: I58b05076cd85b3029777a6bc57fa58932217d71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:01:03 +00:00
Santiago Aboy Solanes
3e82da340a Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: dc15fc2ab5 am: 1fbf7a8f08
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I95ccb4321bfc7144a46c7f9cb725323a8449eda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 09:00:38 +00:00
Betty Chang
55b0007d23 Merge "To correct the title of the LE audio toggle in bluetooth settings" am: 7c92ca6de9 am: 2e4249a884 am: 23ad9de0a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115074

Change-Id: Ib0ff1ecebd96d849b199954fe0689d106a5fff3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:46:42 +00:00
Santiago Aboy Solanes
1fbf7a8f08 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: dc15fc2ab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: Ic8f54bd78486cd16a6513bf1010ed48928578931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:46:12 +00:00
Santiago Aboy Solanes
9103e46b40 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: fdadb861b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I3a95aae1e572e3b23780a50098a0e47a12513d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:45:33 +00:00
Santiago Aboy Solanes
4932a5c9cf Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: 9c98af4839 am: 9966b865ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: Ibef53224a1ba9e419b1671f97d590476eaf90af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:39:05 +00:00
Betty Chang
23ad9de0a4 Merge "To correct the title of the LE audio toggle in bluetooth settings" am: 7c92ca6de9 am: 2e4249a884
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115074

Change-Id: I3634efec19ac14146553c6704e16822c571559d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:38:57 +00:00
Jason Chang
1223f1b47b Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: b5149141aa am: 448334ed3b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: Ic08a91de23e1eca0f87b35abb53417cc080bc849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:38:29 +00:00
Automerger Merge Worker
cd23a4ab2c Merge "Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: 43e9967ee7 am: ed1474c43a" into tm-qpr-dev-plus-aosp 2022-06-07 08:38:19 +00:00
Jason Chang
7b61515db2 Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: 43e9967ee7 am: ed1474c43a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I7f301962e0a37ac501da868aa0e2f7aec656b5a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:38:09 +00:00
Santiago Aboy Solanes
9958454247 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: 9c98af4839 am: 4c1edb45c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I08df7fccad9a291e8fde46b167c843b15fda6962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:37:43 +00:00
Jason Chang
0b44732bc4 Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: b5149141aa am: 230b143a5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: Icba611cf41f446979b4eca239afabe7f39515e0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:37:30 +00:00
Santiago Aboy Solanes
fdadb861b0 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I556a4b89f5d01e213582081e3fd7d071ae7a6fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:21:18 +00:00
Santiago Aboy Solanes
dc15fc2ab5 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I4d901845e9293723e1972ef194949688883bb4e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:21:05 +00:00
Automerger Merge Worker
6b3909cc9c [automerger skipped] Merge "Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c" into tm-d1-dev-plus-aosp am: ee4c7e83d2 -s ours am: 48e05caf05 -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 a1728774ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: Ib0f3e22a55cd6d7eaea1bc50f15f3090e8776f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:18:48 +00:00
TreeHugger Robot
908010e0b9 [automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c am: 62bb51d863 -s ours am: a794511d6c -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 a1728774ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: I3f201bd41b5c17f82b5fff493d6fdcac860959f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:18:08 +00:00
Automerger Merge Worker
294223420a Merge changes from topic "am-17f313b4188b4552a71d909dfdf1d548"
* changes:
  Merge "[automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c -s ours am: 393bdb4396 -s ours" into tm-qpr-dev-plus-aosp am: 33f319f094 -s ours
  [automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c -s ours am: 393bdb4396 -s ours am: 1826f74d3a -s ours
2022-06-07 08:17:04 +00:00
Automerger Merge Worker
692c1f8042 Merge "[automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c -s ours am: 393bdb4396 -s ours" into tm-qpr-dev-plus-aosp am: 33f319f094 -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 a1728774ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: Ia613d6ea92e88a387e7b42c9b9c94654cd7563da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:16:39 +00:00
Santiago Aboy Solanes
9966b865ec Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: 9c98af4839
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I9a7a1073b34de79abebd32634643e3e0f37bb22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:16:29 +00:00
Jason Chang
448334ed3b Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: b5149141aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I8b0c2621a62030b694668f11abc3c5f8fcb0ddb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:16:09 +00:00
TreeHugger Robot
e17c5e2d45 [automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c -s ours am: 393bdb4396 -s ours am: 1826f74d3a -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 2d1b9ae095 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: I233cd3c17925ab4694c22a70c9cb134efa0e9ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:16:06 +00:00
Jason Chang
f0b4811cfd Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: a3e8e6ff91
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I92428b667fe144e1ccd7042c147e35a6d139910f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:15:59 +00:00
Jason Chang
ed1474c43a Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: 43e9967ee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I5b8bfd16850cb810734465974b259a7addd60af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:15:56 +00:00
Santiago Aboy Solanes
4c1edb45c5 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570 am: 9c98af4839
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: I641a58d7507ac4a784f461b410d89e2ec17e8f66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:15:55 +00:00
Jason Chang
230b143a5a Merge "Fix toggle QS tiles don't respond when One-handed mode triggered" into tm-dev am: 1ef440bbed am: b5149141aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18467054

Change-Id: I6f3fb229440d0f4615a3b0f38dfb248b7eb6bfbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:15:47 +00:00
TreeHugger Robot
46fb3b5528 [automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 92c7cf10a9 am: 849c0d24a9 -s ours am: 24d3a9353a -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 2d1b9ae095 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: I0b17526620800e1a8e85c5671bdc814f6180b19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:15:07 +00:00
Betty Chang
2e4249a884 Merge "To correct the title of the LE audio toggle in bluetooth settings" am: 7c92ca6de9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115074

Change-Id: I80e896d5d63be0e0a5185a24fb245a95ac6a3489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 08:13:56 +00:00
Santiago Aboy Solanes
9c98af4839 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev am: 0cbdd27570
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756267

Change-Id: If6d8414efa006a1791188950c28a3ecaa9d1e602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 07:58:36 +00:00
Santiago Aboy Solanes
0cbdd27570 Merge "Update boot image and system server profiles [M10C10P80S0]" into tm-dev 2022-06-07 07:52:57 +00:00
Automerger Merge Worker
48e05caf05 [automerger skipped] Merge "Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c" into tm-d1-dev-plus-aosp am: ee4c7e83d2 -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 a1728774ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: I025087b624c49c1ce382baca33e6a74c9a9ea457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 07:49:02 +00:00
TreeHugger Robot
a794511d6c [automerger skipped] Merge "aidl: Fix missing conversion logic for broadcast device" into tm-dev am: cd17169a8e am: 125630da5c am: 62bb51d863 -s ours
am skip reason: Merged-In I32e2ae9d6d433fb49e76ed3079cf85639eb71486 with SHA-1 a1728774ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18756431

Change-Id: I292dbeb36d1e6a70cb829a0f4b036e0bc63fe5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 07:48:58 +00:00
Betty Chang
7c92ca6de9 Merge "To correct the title of the LE audio toggle in bluetooth settings" 2022-06-07 07:48:45 +00:00
Shaowei Shen
4c558fb924 Merge "DO NOT MERGE: Downbranch merge conflict [Output Switcher] Fix situation when icon is not available for getBitmap" 2022-06-07 07:48:35 +00:00