Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
760,298 Commits 3 Branches 0 Tags
426bd5cd99ee4fdf5b46d751dcc25083d404b005
Commit Graph

760298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob Carr
426bd5cd99 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: I19c5ac9cf13dd9ff8e677b38bd84917ffa2751c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:25:35 +00:00
Rob Carr
6320f3b7e0 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: I924127ed55d0fbefceb4e250baa8cacc26accfd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 15:24:57 +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
429a11db78 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: Id8a4628ab6b9acb9ccee092bad772cc1b5dc83d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 14:59:37 +00:00
Josh Tsuji
184644fd2a 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: I51237b7fc264267a517ea3bf1abbf69b365f67ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 14:58:53 +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
f218065761 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: I9a4db80408b45f10602be6d68c26b1a1917f0b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:57:32 +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
8a6837a777 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: Ic3ea789a658b808c360bf171461a6971f54c24de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:26:00 +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
ad3ab9f50d 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: I28a69c8dca6d586a2b8df7702c8e102267ee8bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:25:38 +00:00
Julia Reynolds
0fc457c983 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: I9de63c5b47b493501945d6d7f4b7f2ff0a703681
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 13:25:16 +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
27e4f97c3e 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: I654d30522b107453d182ec8918265af37c95d29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 12:40:01 +00:00
TreeHugger Robot
8ec931fd44 Merge "Update wallet tile secondary label." into tm-dev 2022-05-05 12:25:05 +00:00
Issei Suzuki
21aba74ce1 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: Ieb4ca7bd1ec04cb945436382a325ab7cb84fdca4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 12:08:39 +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
830ba881cb 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: Ib99c500432617e95ba61ed6403af9884dcc9aef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 11:12:42 +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
d02d2e7a72 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: Ib58c66a2f59828aaa91ea2c4afef9f26ac68677d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 10:18:52 +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
6fb97848d8 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: I6e81d9eb50ae312c351c949bd5fe1e82bec427db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:33:05 +00:00
Jayachandran C
123a134309 [automerger skipped] Merge "Update OWNERs file for telephony xml files" am: ad8b399ec8 am: 2437af1cb0 -s ours 
am skip reason: Merged-In If64d1f34038472dcafd9a94f24879ae9d3056bb1 with SHA-1 95e0b6abbe is already in history

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

Change-Id: Ib1c163ad31fd36a8fe75cb50aa641c3169a46e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:50 +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
bf872bd3a4 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: I972dc93c6c161192867574c1338afecfc5fedbed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:23 +00:00
Kholoud Mohamed
ef770da20c 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: I4c4428399fbdf0618b4b77249a9ff40fd20549b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:56 +00:00
Betty Chang
806ec4fcbf 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: I662dabaa892180d5d6dd077f109ffcaf27bab752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:24 +00:00
Jayachandran C
2437af1cb0 Merge "Update OWNERs file for telephony xml files" am: ad8b399ec8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2083965

Change-Id: I0f1a65f04425ba40cb33f862cc85e9d1dfcd7176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:00 +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
Jayachandran C
ad8b399ec8 Merge "Update OWNERs file for telephony xml files" 2022-05-05 08:06:14 +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
af362f7ee7 [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: I6351e43096426a7604b067f9d7aa02e85ff8a893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:09:09 +00:00
SongFerngWang
822ae07271 [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: I86e56dd21f8ff48f472291d1e065581661ee465d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:09:03 +00:00
Peter Kalauskas
6371d59cb1 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: Ifdc8cdecdb4d3c6a2fa065da6afe337456995a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:13 +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
TreeHugger Robot
f89fbd0834 Merge "Fix physical display ratio incorrect" into tm-dev am: e266bac2bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18157811

Change-Id: I6c02a0297f13958690d53c8b1aab60745bb9e78e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 03:24:58 +00:00
TreeHugger Robot
e266bac2bf Merge "Fix physical display ratio incorrect" into tm-dev 2022-05-05 02:55:12 +00:00
Chiachang Wang
7b0f3d0f11 Merge changes from topic "AppExclusion" am: 7b6fa7c457 am: 3350cb96a3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: Ic5cb43ee4e4c32c2372b78605403ba57afb89b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:22 +00:00
Benedict Wong
7f201bc8b5 Add to/from disk stable format am: 823599b4a8 am: 2e5b004421 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: Id0c89247191fe03425e3e225281d4c6a5c3e6126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:20:04 +00:00
Chiachang Wang
3350cb96a3 Merge changes from topic "AppExclusion" am: 7b6fa7c457 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2076559

Change-Id: I85b1ee3b6e2724f33a9e541527cc377ffb838013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:27 +00:00
Benedict Wong
2e5b004421 Add to/from disk stable format am: 823599b4a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2084734

Change-Id: Ia99f0b3c98bec204526f10d00b0b4db1431e6a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:25 +00:00
Treehugger Robot
e0ceb9de72 Merge "Add USE_CUSTOM_VIRTUAL_MACHINE permission to Shell" am: 87e124332d am: ea4f257004 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2081684

Change-Id: I5f93d5daaaf09eb1d1a257df44bb2781828b734d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 02:19:17 +00:00