Chavi Weingarten
7481dcbbab
Merge "Don't request sync again for reparented WC" into tm-dev am: 7b0ceb4ff1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18148567
Change-Id: Iafb87808349dc088f4d3f6763d60e4c25110ead4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 16:56:17 +00:00
Robert Wu
c0edca9399
Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev am: 5fa99c336c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169657
Change-Id: I78c836e09424f414ccda4aaa6c61c86a9c0f2b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 16:55:57 +00:00
Robert Horvath
6b5a11cf3e
Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev am: 7bea00698c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17907962
Change-Id: Id068a631149212aac3ffe10989bbf41a6cf85b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 16:55:29 +00:00
Chavi Weingarten
7b0ceb4ff1
Merge "Don't request sync again for reparented WC" into tm-dev
2022-05-05 16:10:38 +00:00
Robert Wu
5fa99c336c
Merge "MidiService: Fix USB removeDeviceConnection" into tm-dev
2022-05-05 16:07:31 +00:00
Robert Horvath
7bea00698c
Merge "Dismiss TV PiP when app op OP_PICTURE_IN_PICTURE is revoked" into tm-dev
2022-05-05 16:03:31 +00:00
Aaron Liu
05a16d4af8
Merge "[Bouncer] Match spec for pattern view." into tm-dev am: e87d18f780
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169303
Change-Id: I905eaf4e7be25471c65caa248fd2ecbdef66b99d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 15:27:59 +00:00
Aaron Liu
4588524a5c
Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev am: b560e960bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18077199
Change-Id: I2829fe348c61a22360e45da8ce03d90b376dad12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 15:27:42 +00:00
Rob Carr
f371225580
Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev am: 7a0ee72bff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17778270
Change-Id: Ic310d8a40d500494249932655534bb97e4256753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 15:27:22 +00:00
Rob Carr
3d3692b21d
Merge "SurfaceView: Fix overlocking of mSurfaceLock" into tm-dev am: ec6577d13e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17808703
Change-Id: I6a5e4b0e613d3bfa418453defa5cd9bcc4b35aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 15:26:54 +00:00
Aaron Liu
e87d18f780
Merge "[Bouncer] Match spec for pattern view." into tm-dev
2022-05-05 15:13:01 +00:00
Aaron Liu
b560e960bc
Merge "[Bouncer] Force bouncer into portrait mode." into tm-dev
2022-05-05 15:12:58 +00:00
Rob Carr
7a0ee72bff
Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev
2022-05-05 15:11:39 +00:00
Rob Carr
ec6577d13e
Merge "SurfaceView: Fix overlocking of mSurfaceLock" into tm-dev
2022-05-05 15:09:15 +00:00
Caitlin Cassidy
37b4779314
Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev am: 5630265c02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18144865
Change-Id: I70fe328a292ebdda70dd8e5fe73eafe9a9257c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 15:00:53 +00:00
Josh Tsuji
2f6acab1da
Merge "Unocclude immediately so that the surface animation is visible." into tm-dev am: aa9e92c1a0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18169504
Change-Id: Ibb102ae5fad0db13ba3b2d3537b05d668545a066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 15:00:19 +00:00
Caitlin Cassidy
5630265c02
Merge "[Media] Add some tests in ResumeMediaBrowserTest to ensure we're disconnecting old browsers." into tm-dev
2022-05-05 14:38:52 +00:00
Josh Tsuji
aa9e92c1a0
Merge "Unocclude immediately so that the surface animation is visible." into tm-dev
2022-05-05 14:25:03 +00:00
Samiul Islam
c545627a16
Merge "Disallow external storage access without restricting other api calls" into tm-dev am: 5f0c868b6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17940795
Change-Id: I62f42122279fcbef58d144b05104baa2534f493c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:44:34 +00:00
Samiul Islam
5f0c868b6a
Merge "Disallow external storage access without restricting other api calls" into tm-dev
2022-05-05 13:39:34 +00:00
TreeHugger Robot
4219739b2b
Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev am: aaf912305b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18161842
Change-Id: I0a951bc0b4cf77d490e18999232a5677db38c180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:27:09 +00:00
Prabir Pradhan
16845bff63
Merge "IMS: Intialize static association map before initializing native service" into tm-dev am: fb2c1de5b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185202
Change-Id: Id577a9e84998e8d80077a5492abf2754bbacc187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:26:53 +00:00
Julia Reynolds
e10ae3cd31
Merge "Revert "Clocks were switching too frequently"" into tm-dev am: 203d94b1fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18178894
Change-Id: I1a267e797e1f5ebeac95e4b8451e90520f059a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 13:26:42 +00:00
TreeHugger Robot
aaf912305b
Merge "[Panlingual] Add a flag to control opt-in/out" into tm-dev
2022-05-05 13:25:42 +00:00
Prabir Pradhan
fb2c1de5b7
Merge "IMS: Intialize static association map before initializing native service" into tm-dev
2022-05-05 13:06:27 +00:00
Julia Reynolds
203d94b1fa
Merge "Revert "Clocks were switching too frequently"" into tm-dev
2022-05-05 12:57:05 +00:00
TreeHugger Robot
8c9e554436
Merge "Update wallet tile secondary label." into tm-dev am: 8ec931fd44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18127905
Change-Id: I978ef10910cb84f4134d5969e3a26b651228f920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:41:12 +00:00
TreeHugger Robot
8ec931fd44
Merge "Update wallet tile secondary label." into tm-dev
2022-05-05 12:25:05 +00:00
Issei Suzuki
48fd600e17
Merge "Suppress app transition while recents is running" into tm-dev am: 0d83eb099d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18140343
Change-Id: I5d5002f5146835115205445b7260a5eeb035997b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 12:10:19 +00:00
Issei Suzuki
0d83eb099d
Merge "Suppress app transition while recents is running" into tm-dev
2022-05-05 11:31:48 +00:00
Prabir Pradhan
94a327e6e4
IMS: Intialize static association map before initializing native service
...
There is a possible race condition between map access from the native
side and the map initialization.
Bug: 231489654
Test: None
Change-Id: Ia915a10ffdb21cbc242031e3f6a536077948659c
2022-05-05 11:21:20 +00:00
TreeHugger Robot
8701caa278
Merge "Add accessibility action menu items for divider" into tm-dev am: 55dd1c3792
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18155923
Change-Id: Ibe765efe1509f35cfced305a19d66e1f12eb25bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 11:14:06 +00:00
TreeHugger Robot
55dd1c3792
Merge "Add accessibility action menu items for divider" into tm-dev
2022-05-05 10:54:21 +00:00
Michał Brzeziński
59efb31209
Merge "Adjust QS side spacing in split shade according to specs" into tm-dev am: eb08799ad3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17658388
Change-Id: I14be95d5512c1ecc4e37e881a19a7b83ae1e6a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 10:21:30 +00:00
Michał Brzeziński
eb08799ad3
Merge "Adjust QS side spacing in split shade according to specs" into tm-dev
2022-05-05 09:51:50 +00:00
Charles Chen
1a1349553f
Merge "Use current user Context to generate NavBar layout" into tm-dev am: a7abdb12df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18030506
Change-Id: Iede5281fe2ed9e39966c45362208e0048f28253a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:18:57 +00:00
Charles Chen
a7abdb12df
Merge "Use current user Context to generate NavBar layout" into tm-dev
2022-05-05 09:15:03 +00:00
SongFerng Wang
dfc0cf8469
Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev am: 5f937a7093
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18130743
Change-Id: Id17dd2c85cdde329cfa8c59fdbba262313874338
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:25 +00:00
Kholoud Mohamed
0a10b8cc8b
Merge "Add missing settings strings" into tm-dev am: e1bcab3b51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324
Change-Id: I89ebaf8c2ddebd58d2032707b1ab1f550e7e7c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:09:05 +00:00
Betty Chang
902d4e1ff7
Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev am: 439436e104
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18162824
Change-Id: I6f425e01a1caee828ea881ea50d07d88405502ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 09:08:44 +00:00
SongFerng Wang
5f937a7093
Merge "[LE broadcast sink] Add the broadcast sink apis" into tm-dev
2022-05-05 08:50:20 +00:00
Kholoud Mohamed
e1bcab3b51
Merge "Add missing settings strings" into tm-dev
2022-05-05 08:14:57 +00:00
Betty Chang
439436e104
Merge "[LE] Convert the BluetoothLeBroadcastSubgroup to QR code format string" into tm-dev
2022-05-05 08:02:18 +00:00
Sam Dubey
1ab0ed29e4
Revert "Clocks were switching too frequently"
...
This reverts commit ea154b06db .
Reason for revert: Breaking presubmits (hideSilentNotificationsPerUserSetting* test)
Bug: 231494084
Change-Id: I37f5a1464328a24a7585c262d7f86295c21cd65a
2022-05-05 06:25:17 +00:00
SongFerngWang
2b62de12ce
[LE broadcast sink] Add the broadcast sink apis
...
Bug: 228258236
Test: manual test
Change-Id: I7a5872a17f0e3d5e1b32579a2fb7b52c2236d060
2022-05-05 06:00:33 +00:00
Lucas Dupin
3df0f734e4
[automerger skipped] Merge "The stop string is media_output_dialog_button_stop_casting" into tm-dev am: 100004b0ca -s ours
...
am skip reason: Merged-In Idd26d2b4e10dfcd00045184ddd2f9815a02ec7ce with SHA-1 6197f495a9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18158825
Change-Id: I11aad25c413b60ac8719ebfa8d2143a7426369c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:10:45 +00:00
SongFerngWang
294ae6f3e6
[automerger skipped] The stop string is media_output_dialog_button_stop_casting am: 0426625408 -s ours
...
am skip reason: Merged-In Idd26d2b4e10dfcd00045184ddd2f9815a02ec7ce with SHA-1 6197f495a9 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18158825
Change-Id: Ib39fe8e3ed51bc36617e3bc19284820fc7be4fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:10:40 +00:00
Peter Kalauskas
0af27585e6
Merge "Move product string definition" into tm-dev am: b09396142a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18171679
Change-Id: I51c580dfe13a99db5b59ad1a0f8427bad2de200e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-05 05:10:17 +00:00
Lucas Dupin
100004b0ca
Merge "The stop string is media_output_dialog_button_stop_casting" into tm-dev
2022-05-05 04:56:02 +00:00
Peter Kalauskas
b09396142a
Merge "Move product string definition" into tm-dev
2022-05-05 04:09:15 +00:00