Commit Graph

787482 Commits

Author SHA1 Message Date
Issei Suzuki
a5c1feda65 Merge "Revert "Suppress app transition while recents is running"" into tm-dev am: d2303d97a4 am: b32c07e85f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18204686

Change-Id: I56ac1aca673d66a75d75f2dd36ce9e478629c133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:35:59 +00:00
Prabir Pradhan
d435787f54 Merge "Support multi-window handwriting without focus requirement on down" into tm-dev am: 003535ddbe am: 424bbd2523
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982123

Change-Id: Ideb6ffcd5b61bf1fd18b3a7a7af6cc9b499c98d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:28:24 +00:00
Siim Sammul
9384c7109d Merge "Update the rate limiting parameters to be a bit more strict in limiting, but keep the buffer longer before reset." into tm-dev am: 7d302d0927 am: 4645dec457
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029562

Change-Id: I516a5d225b073ee48dfda4eb21f779172057ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:12:12 +00:00
TreeHugger Robot
d88f549311 Merge "Add new methods to activate/deactivate session" into tm-dev am: c9daa03269 am: 533fd8b762
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156700

Change-Id: I4529eeb8bd0df62f0153f7f789f2e8d293f06223
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 17:05:47 +00:00
Sergey Nikolaienkov
55b163816c [automerger skipped] Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef79199 am: f9809031f7 -s ours
am skip reason: Merged-In I5dad0b1859f5292fc0db68ca6ce2114eaa889d4e with SHA-1 ffde627f6d is already in history

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

Change-Id: I6c65d7258c2948f869e771fd31a579238b85c041
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:54:29 +00:00
Kholoud Mohamed
2975f33bfe [automerger skipped] Merge "RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments" into tm-dev am: 845fb5095c am: 76379969f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a55b88c9456079d1cb0f10664b7bdab6a64d66b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:50:08 +00:00
kholoud mohamed
14a8c0a7ca [automerger skipped] RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d am: 0d39af7ff3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I368c1f99874bcafe82f14a10d983d33ba9a01697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:49:50 +00:00
Issei Suzuki
b32c07e85f Merge "Revert "Suppress app transition while recents is running"" into tm-dev am: d2303d97a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18204686

Change-Id: Ibc4afa8af9131ac0ecb9e5af261e5de176adeff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:48:40 +00:00
Prabir Pradhan
424bbd2523 Merge "Support multi-window handwriting without focus requirement on down" into tm-dev am: 003535ddbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17982123

Change-Id: I5c34b95e8096f27e3dbedadaa4d5e09147f66533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:47:22 +00:00
TreeHugger Robot
9404e5a118 Merge "Fix memory usage issue on WindowTokenClient" into tm-dev am: 20bb840b29 am: 9fe8e12b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186210

Change-Id: Ic7fb418a06edc6ccc784da4be38f06d9141f1802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:28:26 +00:00
Siim Sammul
4645dec457 Merge "Update the rate limiting parameters to be a bit more strict in limiting, but keep the buffer longer before reset." into tm-dev am: 7d302d0927
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18029562

Change-Id: Ib031ec560110f9918662a32884c1982aaafbd0d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 16:13:01 +00:00
TreeHugger Robot
533fd8b762 Merge "Add new methods to activate/deactivate session" into tm-dev am: c9daa03269
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18156700

Change-Id: I040ab17de6c808dd49a16217ed536849e5e9bb92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:53:46 +00:00
Michael Hoisie
2042cf6e30 Merge "Fix a thread leak due to a race condition in BackdropFrameRenderer" 2022-05-09 15:38:09 +00:00
Sergey Nikolaienkov
f9809031f7 Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev am: 8b0ef79199
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907952

Change-Id: I1174ac42cf4ea54e947c22645f78dd579d4b255e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:17:43 +00:00
Kholoud Mohamed
76379969f7 Merge "RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments" into tm-dev am: 845fb5095c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: I16c63989cb316dc9f20d657a436feaec682f394f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:08:01 +00:00
kholoud mohamed
0d39af7ff3 RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments am: f90b1ac98d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164349

Change-Id: I033ee8ef2aa8b636a638ba53b4a91d8329aecd35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:07:50 +00:00
Nick Chameyev
ec3b44fcff [automerger skipped] Merge "Update cache key calculation for statusbar insets" into tm-qpr-dev am: 2a02427167 am: 8922c97a57 -s ours
am skip reason: Merged-In Ibd8575529b031747a802b56db3eb12069b9ba6b0 with SHA-1 aff24f9a1b is already in history

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

Change-Id: I2649e986015400d7c67045e06eca011c54c7765d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 15:04:31 +00:00
TreeHugger Robot
9fe8e12b25 Merge "Fix memory usage issue on WindowTokenClient" into tm-dev am: 20bb840b29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186210

Change-Id: Ie28d3cf2417784976961fcbfc7689bd63b5833db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:47:29 +00:00
Nick Chameyev
8922c97a57 Merge "Update cache key calculation for statusbar insets" into tm-qpr-dev am: 2a02427167
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17915083

Change-Id: I565458fd927f3a4f9d442d183b43ac68dcc508dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:20:12 +00:00
Riddle Hsu
f92334a0e5 Merge "Avoid extra force-relayout for sync" into tm-qpr-dev am: 51041e3cec am: d8ded730ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185744

Change-Id: Icc73eea8588bfff777ddb6a8a78f18fd85484a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 14:18:10 +00:00
Nick Chameyev
2a02427167 Merge "Update cache key calculation for statusbar insets" into tm-qpr-dev 2022-05-09 10:51:14 +00:00
Issei Suzuki
d2303d97a4 Merge "Revert "Suppress app transition while recents is running"" into tm-dev 2022-05-09 10:00:41 +00:00
Prabir Pradhan
003535ddbe Merge "Support multi-window handwriting without focus requirement on down" into tm-dev 2022-05-09 09:18:01 +00:00
Siim Sammul
7d302d0927 Merge "Update the rate limiting parameters to be a bit more strict in limiting, but keep the buffer longer before reset." into tm-dev 2022-05-09 09:11:13 +00:00
TreeHugger Robot
c9daa03269 Merge "Add new methods to activate/deactivate session" into tm-dev 2022-05-09 08:09:46 +00:00
kholoud mohamed
c582e29560 RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments
Bug: 225178429
Test: N/A
Change-Id: Ic4a57962a69a31daf498bf87888bae23246f60b6
(cherry picked from commit f90b1ac98d)
Merged-In: Ic4a57962a69a31daf498bf87888bae23246f60b6
2022-05-09 08:09:14 +00:00
Sergey Nikolaienkov
8b0ef79199 Merge "Add simulate-device-(dis)appeared CDM shell commands" into tm-dev 2022-05-09 08:08:16 +00:00
Kholoud Mohamed
845fb5095c Merge "RESTRICT AUTOMERGE Add namespace for DevicePolicyManager P/H experiments" into tm-dev 2022-05-09 07:17:40 +00:00
TreeHugger Robot
20bb840b29 Merge "Fix memory usage issue on WindowTokenClient" into tm-dev 2022-05-09 07:16:15 +00:00
Riddle Hsu
d8ded730ea Merge "Avoid extra force-relayout for sync" into tm-qpr-dev am: 51041e3cec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185744

Change-Id: I80a9f3c7659a6d14eb2ceeb30ed923c89c08948c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 06:47:32 +00:00
Riddle Hsu
51041e3cec Merge "Avoid extra force-relayout for sync" into tm-qpr-dev 2022-05-09 06:03:05 +00:00
Jack Yu
3d3d2c950e [automerger skipped] Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a62f am: d5718c7c66 -s ours am: 0c28c83ba5 -s ours am: 5ec01f858e -s ours am: 310a04a3c5 -s ours
am skip reason: Merged-In I6d09ade1650e226a965547e3f78e74f3f2ffec59 with SHA-1 c5a53c4125 is already in history

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

Change-Id: Ifcd04c1d1541fb2a23896ec2d02f3a0182348165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:47:05 +00:00
Sarah Chin
292523f12e [automerger skipped] SetDataEnabled indicate calling package am: 967c10b103 am: 04470f4d33 -s ours am: 2ee623fbd5 -s ours am: 30d90f4cb7 -s ours am: 88eb6ad641 -s ours
am skip reason: Merged-In I769437e9332f27c0990c37f60ad6d9db284e86cf with SHA-1 ac94df2bab is already in history

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

Change-Id: I8d2ffd694a43a1456d3ab425842d260c61f11fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:46:45 +00:00
Hyundo Moon
fbd2dc31e6 [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa am: 679868156a -s ours am: bbde5e1fdb -s ours am: 522880b348 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 004e2f12e2 is already in history

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

Change-Id: I86061fc04f6392bd6104ad00895c2c5470dad5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:45:33 +00:00
Hyundo Moon
e14b168173 [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa am: 679868156a am: 21bf183ae9 -s ours am: f441c83baa -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 004e2f12e2 is already in history

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

Change-Id: I84f10292ca09e3d9fc621ab9d3e603c80eb598c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:45:07 +00:00
Hyundo Moon
93294d572a [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa -s ours am: 7874f3f7d4 -s ours am: a8dc385cff -s ours am: a859282288 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: I19309a1957686acac42fd4d3a61c879f506ebcbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:43:51 +00:00
Hyundo Moon
494a75197c [automerger skipped] Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice am: 004e2f12e2 -s ours am: 1f6554d804 -s ours am: 49fc2946e8 -s ours am: d948d7b1ef -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: I04e6faed8a0f5b6093cd69763c90e9bac9a80b30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:43:16 +00:00
Jack Yu
310a04a3c5 [automerger skipped] Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a62f am: d5718c7c66 -s ours am: 0c28c83ba5 -s ours am: 5ec01f858e -s ours
am skip reason: Merged-In I6d09ade1650e226a965547e3f78e74f3f2ffec59 with SHA-1 c5a53c4125 is already in history

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

Change-Id: I8e1eea47e0002ac2aa324d1aece3640c5fd3a473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:26:02 +00:00
Sarah Chin
88eb6ad641 [automerger skipped] SetDataEnabled indicate calling package am: 967c10b103 am: 04470f4d33 -s ours am: 2ee623fbd5 -s ours am: 30d90f4cb7 -s ours
am skip reason: Merged-In I769437e9332f27c0990c37f60ad6d9db284e86cf with SHA-1 ac94df2bab is already in history

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

Change-Id: I94727b9d3116db4ac084f5b2e8f2ef04a81da300
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:25:57 +00:00
Hyundo Moon
522880b348 [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa am: 679868156a -s ours am: bbde5e1fdb -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 004e2f12e2 is already in history

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

Change-Id: Id2f662f329b37131daa88a8826b3afbbde7d8d9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:25:08 +00:00
Hyundo Moon
f441c83baa [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa am: 679868156a am: 21bf183ae9 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 004e2f12e2 is already in history

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

Change-Id: If6f81e401abaff588f11e5ae3b0170c57b8ff1d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:24:53 +00:00
Hyundo Moon
a859282288 [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa -s ours am: 7874f3f7d4 -s ours am: a8dc385cff -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: I0ed482f71c3f4f57c9ce9db314bf525e48ef0858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:24:34 +00:00
Hyundo Moon
d948d7b1ef [automerger skipped] Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice am: 004e2f12e2 -s ours am: 1f6554d804 -s ours am: 49fc2946e8 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: Ia40f74cfd0245e040ad1a7dc1253dcad140914d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:24:31 +00:00
Jack Yu
5ec01f858e [automerger skipped] Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a62f am: d5718c7c66 -s ours am: 0c28c83ba5 -s ours
am skip reason: Merged-In I6d09ade1650e226a965547e3f78e74f3f2ffec59 with SHA-1 c5a53c4125 is already in history

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

Change-Id: I5d1e368e0948718872f7d912ea63dc7610fe94f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:18:32 +00:00
Sarah Chin
30d90f4cb7 [automerger skipped] SetDataEnabled indicate calling package am: 967c10b103 am: 04470f4d33 -s ours am: 2ee623fbd5 -s ours
am skip reason: Merged-In I769437e9332f27c0990c37f60ad6d9db284e86cf with SHA-1 ac94df2bab is already in history

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

Change-Id: Ic35a1b89d264fff61280a539022b4b1141b93bb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:18:27 +00:00
Jack Yu
0c28c83ba5 [automerger skipped] Merge changes from topics "enterprise_internet", "set_data_enabled" am: 0d0729a62f am: d5718c7c66 -s ours
am skip reason: Merged-In I6d09ade1650e226a965547e3f78e74f3f2ffec59 with SHA-1 c5a53c4125 is already in history

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

Change-Id: I4fdd2b1e8561854f89259225cabfb94a2214a6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:12:02 +00:00
Sarah Chin
2ee623fbd5 [automerger skipped] SetDataEnabled indicate calling package am: 967c10b103 am: 04470f4d33 -s ours
am skip reason: Merged-In I769437e9332f27c0990c37f60ad6d9db284e86cf with SHA-1 ac94df2bab is already in history

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

Change-Id: Ib55de7dfc79d7603c9da422abe18b5d67bda056a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:11:45 +00:00
Hyundo Moon
bbde5e1fdb [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa am: 679868156a -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 004e2f12e2 is already in history

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

Change-Id: I82264ee90e86389c585acb2ba1b5718987697983
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:11:11 +00:00
Hyundo Moon
21bf183ae9 Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa am: 679868156a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157297

Change-Id: I5a6e0d6cc309622cb1240d57c83e95a113cde325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:11:09 +00:00
Hyundo Moon
a8dc385cff [automerger skipped] Merge "Rename CachedBluetoothDevice.setMemberDevice to addMemberDevice" into tm-dev am: 24f7beacfa -s ours am: 7874f3f7d4 -s ours
am skip reason: Merged-In I39242b40ebe154b8b89f00f48ea320b18f56ecd7 with SHA-1 5c811c4df5 is already in history

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

Change-Id: I3de8fccb149c77c53da2da6ea0447ab266160911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-09 05:10:46 +00:00