Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
773,993 Commits 3 Branches 0 Tags
bda2f9102485d7364ab7b20be710f8bb2af91a31
Commit Graph

773993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Johnston
bda2f91024 Merge "Add background protection when work biometrics is shown" into tm-dev am: ed00c662dc am: 9eeb0112fd am: 00090b1d4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351382

Change-Id: I94f2454013dc0bf3671d69d92a5906b32183912d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:14:07 +00:00
Automerger Merge Worker
0e314a78e9 Merge "[automerger skipped] Merge "Set correct volume storage path for SDK sandbox" into tm-dev am: 0b28d29298 am: 49f81abcbe am: ad494b49bb -s ours" into tm-qpr-dev-plus-aosp 2022-05-18 22:13:59 +00:00
Sanjana Sunil
23a363e541 [automerger skipped] Merge "Set correct volume storage path for SDK sandbox" into tm-dev am: 0b28d29298 am: 49f81abcbe am: ad494b49bb -s ours 
am skip reason: Merged-In Ib72ea559363cdeb4b7cfcc2f48ca8ddace96e352 with SHA-1 79241ae7d9 is already in history

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

Change-Id: I9c17252397f5d71ce1877fe0bd8900cdfe3a61d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:13:48 +00:00
TreeHugger Robot
3c962891d6 Merge "[SparseSetArray] optimize copy constructor" into tm-dev am: 79286a97fd am: 8a160c4937 am: bfe637c5fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18415062

Change-Id: Id9608490dfa4aed3055df6f6f5c42a071074bf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:13:45 +00:00
Shan Huang
e103955b36 Merge "Transfer IME callbacks when app's focused root view changes." into tm-dev am: f15480984d am: 40f337eabe am: 76bf9ac13c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18417321

Change-Id: I16b0c21e206b89a9f6f0a3cc8a075e614af59513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:13:33 +00:00
Automerger Merge Worker
fd8261e9e7 Merge "[automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours am: 043d3bd55f -s ours am: bb5255b7d2 -s ours am: 329eb9d4b2 -s ours am: 47c160d537 -s ours am: 5f9d51baa3 -s ours am: 8aabf0e634 -s ours" into tm-qpr-dev-plus-aosp 2022-05-18 22:13:28 +00:00
TreeHugger Robot
3a20d85deb [automerger skipped] [DO NOT MERGE] [conflict] Merge "Make sure callingPackage belongs to callingUid when checking BG-FGS restrictions." into rvc-dev am: a70add46f3 am: a4bbe303ff -s ours am: 043d3bd55f -s ours am: bb5255b7d2 -s ours am: 329eb9d4b2 -s ours am: 47c160d537 -s ours am: 5f9d51baa3 -s ours am: 8aabf0e634 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2e95a85c6ecafd73a896cf9c2e7071b897166f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:13:22 +00:00
Aaron Liu
b0069f80fd Merge "[QS] Do not set QS visible when animating away." into tm-dev am: e63fb2fde8 am: 0ecf693791 am: 04441702ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18354261

Change-Id: I103e939d631dd1cc9d38cfb83052412e3fe67ef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:13:12 +00:00
TreeHugger Robot
87b03c1550 Merge "Add targets for tablet/tv product variants" into tm-dev am: 04f59c26f6 am: 58b58904d6 am: 84f865bdd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18397976

Change-Id: I31453444bc894ce660e2e15bb01125f22686b0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:12:57 +00:00
Automerger Merge Worker
cebc9bda61 Merge "Merge "Improve javadoc for Wi-Fi related policies" into tm-dev am: e51b62b2a3 am: 46c447841b am: e9c2c81494" into tm-qpr-dev-plus-aosp 2022-05-18 22:12:49 +00:00
TreeHugger Robot
8e9c61c8ac Merge "Improve javadoc for Wi-Fi related policies" into tm-dev am: e51b62b2a3 am: 46c447841b am: e9c2c81494 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18374443

Change-Id: I72cfef8481e6320af4636c9346417f2ad460d2c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:12:29 +00:00
TreeHugger Robot
ca18eb3d58 Merge "Introduce JobScheduler quota bumps in lieu of bucket changes." into tm-dev am: d0333d3682 am: ad450332f3 am: fc61e58eb4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18204754

Change-Id: I880f1cb4c819904f562b571c7fe75390d98324a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:12:27 +00:00
TreeHugger Robot
d89d2404a9 Merge "Check sleep reason and time before cancelling vibrations" into tm-dev am: 79dc62bfef am: 7aff58a3f9 am: 2f97283a64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280949

Change-Id: I0c0b54713fe639b63ba71de936cc9e572026f502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:12:16 +00:00
TreeHugger Robot
3a13203b5a Merge "Fix the SysUI dialogs size after rotating" into tm-dev am: f694241615 am: 0403d84f2d am: 1a76c5942c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375395

Change-Id: I8d44d8cf3c6271b1ff1a555de6f506f95fc069c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:12:09 +00:00
Automerger Merge Worker
a5381d945e Merge "Merge "Merge "Avoid warning log from InteractionJankMonitor in VolumeDialogImpl" into tm-dev am: d8dbe24c35 am: 5c4b104608" into tm-d1-dev-plus-aosp am: 96e80b5e86" into tm-qpr-dev-plus-aosp 2022-05-18 22:12:05 +00:00
Automerger Merge Worker
0e733bbb00 Merge "Merge "Avoid warning log from InteractionJankMonitor in VolumeDialogImpl" into tm-dev am: d8dbe24c35 am: 5c4b104608" into tm-d1-dev-plus-aosp am: 96e80b5e86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18401537

Change-Id: Ie24783df728c73361a4683ef5cc514712b596c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:12:02 +00:00
Grace Cheng
aa5e149085 [automerger skipped] Merge "Schedule UDFPS IPCs on the dedicated biometric thread" into tm-dev am: 5305852105 -s ours am: 6e1fa7f542 -s ours am: 7d7d4975a6 -s ours 
am skip reason: Merged-In I3d46e46db888bcf5a54faa009d96ce53611ca077 with SHA-1 e435401edd is already in history

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

Change-Id: I82f49e3ee2f5304c9c9a6fce534266f8995120b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:58 +00:00
Grace Cheng
80ebe5cf20 [automerger skipped] Schedule UDFPS IPCs on the dedicated biometric thread am: 299340601b -s ours am: d8396cc851 -s ours am: 7b361ecc81 -s ours 
am skip reason: Merged-In I3d46e46db888bcf5a54faa009d96ce53611ca077 with SHA-1 e435401edd is already in history

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

Change-Id: I1568403f1ef63c0c74304356bdf3c048ba3bdba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:55 +00:00
TreeHugger Robot
ea9bc82785 Merge "AudioService: persist/restore audio device spatial audio settings" into tm-dev am: 11782ee969 am: 7f75f8a3b0 am: 20d1917396 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18385019

Change-Id: I09f11820881a8733f0cc4d4908beab75602e68c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:45 +00:00
TreeHugger Robot
e8e79e9755 Merge "Move service initialization" into tm-dev am: ac94a2dacd am: dd7d5fcd1e am: 94bffae8a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18414748

Change-Id: I5f7443314f8c5cfba10944acc5cb1089a28ca0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:30 +00:00
Automerger Merge Worker
2dfe211a5a Merge "[automerger skipped] Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev am: d2a905d587 am: cb9d40ef72 am: 7bb23816f8 -s ours" into tm-qpr-dev-plus-aosp 2022-05-18 22:11:20 +00:00
Shan Huang
54404e2221 [automerger skipped] Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 8efc556da6 -s ours am: 2dc456e1b9 -s ours 
am skip reason: Merged-In I1738b40c8df1c9af7bb0e63586cb2e70b3c9e8ca with SHA-1 4b016bd6eb is already in history

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

Change-Id: I574e0bf66ef1cd4bd19288b1e81f692c386d2849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:11 +00:00
TreeHugger Robot
858ab72088 [automerger skipped] Merge "Don't throw in socket_read if socket_read_all returns < 0" into tm-dev am: d2a905d587 am: cb9d40ef72 am: 7bb23816f8 -s ours 
am skip reason: Merged-In I2a04a799d3748c221f8555fa7afc40d73f0f392c with SHA-1 e6cf914c3f is already in history

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

Change-Id: Ic83145e787250f4026b8808c23b7991ffa9da993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:09 +00:00
Sudheer Shanka
d7d86de90b Merge "Update OWNERS for broadcast response related classes." into tm-dev am: 9af0eed1de am: 851c7f61ad am: 89103ce2b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377776

Change-Id: If618dcc3d35a5ee9842be977761014148f4f56c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:11:00 +00:00
Automerger Merge Worker
92f3c6e4c2 Merge "Merge "Add config for save dialog height percent" into tm-dev am: a5f8f650ce am: 0d2835b4ac am: 2010849056" into tm-qpr-dev-plus-aosp 2022-05-18 22:10:55 +00:00
TreeHugger Robot
428a059ea0 Merge "Add config for save dialog height percent" into tm-dev am: a5f8f650ce am: 0d2835b4ac am: 2010849056 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18260673

Change-Id: I6283941de09b2fc7ed2424a53fb37ef773870533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:10:50 +00:00
Automerger Merge Worker
db4b07ad6f Merge "Merge "Check task switch by comparing leaf task." into tm-dev am: f55e364598 am: 16f304c921" into tm-d1-dev-plus-aosp am: 46cecd43bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18425963

Change-Id: I39ba4838a5114b1da31095c7d4111fb18967d68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:10:48 +00:00
Jerry Chang
7af288c1ad Merge "Add a config to control split-screen task dimming" into tm-dev am: b15f154c2b am: 9ad8b30c3e am: 550c4752b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281607

Change-Id: I4073be15e4c42b1159b735215082bd7d1d9fbae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:10:22 +00:00
TreeHugger Robot
45d423422f Merge "Move optimization to later part of pipeline" into tm-dev am: c912ad84b5 am: 1d9dc51411 am: c91e5dc4e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18396020

Change-Id: I136dff396d5ad475a0b4659982dc44a2a12b8136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:10:08 +00:00
TreeHugger Robot
e39845c3a2 Merge "[Media] Add some tracing to media classes." into tm-dev am: ee1b4d021f am: 7d2be046f9 am: 1204b8d959 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18379011

Change-Id: Ifa9c1ed3bc5cb15877981fa8ea7599795aa1384f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:09:53 +00:00
Manjeet Rulhania
d677003693 [automerger skipped] Merge "Fix duplicate permission privilege escalation" into qt-dev am: b22a6d7372 am: e545a5dbbf -s ours am: 94c1765004 -s ours am: 7aaba89b77 -s ours am: 89ed3dc229 -s ours am: b0ec7cce63 -s ours am: a29bc941f8 -s ours am: 8c88d03041 -s ours am: 0d1e3e7677 -s ours am: dd4645d8de -s ours 
am skip reason: Merged-In I1910dca44104e35a57eba4acfa8188cd9b8626ac with SHA-1 f9a9dc720c is already in history

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

Change-Id: I13397b4d6103e64c23c82d17d2d2807a2757b2c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:09:38 +00:00
Automerger Merge Worker
d63c2995bf Merge "Merge "Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c6419 am: d2cdcde557" into tm-d1-dev-plus-aosp am: 55c29cf342" into tm-qpr-dev-plus-aosp 2022-05-18 22:09:34 +00:00
Mady Mellor
84164e5de5 [automerger skipped] Merge "When a user is removed make sure we remove their persisted bubbles" into tm-dev am: f0f1105de7 am: dd7397e3d5 am: 2a40a813db -s ours 
am skip reason: Merged-In Ia147cbac15ebce70bbbcc52926089f33901a99dc with SHA-1 08a4570f32 is already in history

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

Change-Id: I7a53a0272679a87a108b76542cdf761a8b7d1e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:09:18 +00:00
Automerger Merge Worker
95bc3f620a Merge "Merge "Group broadcasts occurred within a certain duration into sessions." into tm-dev am: 0a790c6419 am: d2cdcde557" into tm-d1-dev-plus-aosp am: 55c29cf342 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360308

Change-Id: I2ae1cf006efed7ff98891ac56a85e773cc90cf92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:09:15 +00:00
TreeHugger Robot
5aab95dc56 Merge "Prevent user stop of protected apps" into tm-dev am: 564965fc82 am: 81d0503818 am: 2a82df99d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18060805

Change-Id: Ie3f48d73330149aa92c5fe91a1718f5a44fddcdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:08:58 +00:00
Matt Casey
640242a1d4 Merge "Style fixes for mini resolver" into tm-dev am: 2f6f3aa732 am: dd06c94d6e am: 57bd19265a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18343548

Change-Id: I52771a9edacc182ff01021b63e608d930756c155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:08:48 +00:00
Sudheer Shanka
55140e6207 Merge "Don't consider PACKAGE_USAGE_STATS permission." into tm-dev am: 4bc2075b9f am: 0363c59882 am: e4c3cf50e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18188884

Change-Id: I9bd6624bc9e9c4b05226d41769a7fd525f5c4086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:08:28 +00:00
Yasin Kilicdere
3b8bedbcc9 Merge "Puts mPm.onNewUserCreated inside Binder.withCleanCallingIdentity" into tm-dev am: 3a6a67c5b4 am: 8caa4bb276 am: 55f81b9a2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18356864

Change-Id: Ifed286d5612f55e3ecd41c6bc690a32a41b4efe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:08:15 +00:00
Automerger Merge Worker
1d34cd31d6 Merge changes from topic "am-3703178f80294e8e8863e6950a6243eb" into tm-qpr-dev-plus-aosp 
* changes:
  Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: b5d25971f9 am: 9f157e040b
  Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90c5 am: 8c5b32dc04 am: b6b6acb456
 2022-05-18 22:08:07 +00:00
TreeHugger Robot
d276ec80ca Merge "Remove duplicate allowlist entries for Bluetooth" into tm-dev am: 5ea9ade689 am: b5d25971f9 am: 9f157e040b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18080601

Change-Id: Ia23ac8ea4654d79780b363ad0734938cd72fd560
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:59 +00:00
TreeHugger Robot
f296e8bfc8 Merge "Improve javadoc for Wi-Fi related policies" into tm-dev am: e51b62b2a3 am: 46c447841b am: 5e287d77d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18374443

Change-Id: I37e6f0a8360f7fca2a78f4cb2b348b8f672e0a92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:56 +00:00
TreeHugger Robot
10285488f5 Merge "Remove vendor apex privapp allowlist pruning" into tm-dev am: 05e61e90c5 am: 8c5b32dc04 am: b6b6acb456 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988646

Change-Id: I3c62f5be60669830042f511f3debe297ffba8acc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:55 +00:00
Automerger Merge Worker
24d2e7e17c Merge "Merge "Check sleep reason and time before cancelling vibrations" into tm-dev am: 79dc62bfef am: 7aff58a3f9 am: 41bfea28c0" into tm-qpr-dev-plus-aosp 2022-05-18 22:07:47 +00:00
TreeHugger Robot
0473ee8b65 Merge "Check sleep reason and time before cancelling vibrations" into tm-dev am: 79dc62bfef am: 7aff58a3f9 am: 41bfea28c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280949

Change-Id: I822e7a19f3e8bb24bf4960f9927134785f9d2c5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:42 +00:00
Jiakai Zhang
9ad380a85a Merge "Only check System UI dexopt status after a mainline update or an OTA." into tm-dev am: 7ed6106f10 am: e92f309e31 am: dfd2070616 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907961

Change-Id: I3b2415bb330d27122f0821b5e3aab8287dc111cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:37 +00:00
Automerger Merge Worker
798892cae2 Merge "[automerger skipped] Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 8efc556da6 am: f0712948d3 -s ours" into tm-qpr-dev-plus-aosp 2022-05-18 22:07:29 +00:00
Shan Huang
a522e5874c [automerger skipped] Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 8efc556da6 am: f0712948d3 -s ours 
am skip reason: Merged-In I1738b40c8df1c9af7bb0e63586cb2e70b3c9e8ca with SHA-1 4b016bd6eb is already in history

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

Change-Id: I21d35fce89736138102bfb7a33ac4ffe1868e3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:26 +00:00
Justin Weir
0f126eaf8b Merge "Move Volume control Binder calls to worker thread" into tm-dev am: 6f8b2f6da2 am: 7c9fa45a85 am: 761f882c2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350527

Change-Id: Id0bd6de9bc7c8a7d98b965102170027d1e8e4820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:22 +00:00
Automerger Merge Worker
50710f7767 Merge "Merge "Update OWNERS for broadcast response related classes." into tm-dev am: 9af0eed1de am: 851c7f61ad am: 8ea69bab70" into tm-qpr-dev-plus-aosp 2022-05-18 22:07:17 +00:00
Sudheer Shanka
bb9bbb950f Merge "Update OWNERS for broadcast response related classes." into tm-dev am: 9af0eed1de am: 851c7f61ad am: 8ea69bab70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18377776

Change-Id: I5c6b9958b392ab529528b5c7f1f7ac685ed6cffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:07:10 +00:00