Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
758,501 Commits 3 Branches 0 Tags
5475e102f87f328d42e87412f2ae2dff5575a2e8
Commit Graph

758501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Brzeziński
5475e102f8 Merge "Adjusting bottom QQS padding in large screen shade" into tm-dev am: c161367148 am: b758be6a5f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693924

Change-Id: I978daa8bb9664dbda75d2137796fa0d3a801fac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:39:38 +00:00
Mark Renouf
5993f37b60 Merge "Fix potential StrictMode crash with miniresolver" into tm-dev am: 05709ae494 am: d46bf5c5d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17621331

Change-Id: I3b018fa02c862fc8bb0aae7243432426ce07c619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:39:13 +00:00
Beth Thibodeau
8317fb49e8 Merge "Revert "Enable media session flag by default"" into tm-dev am: d39f10737c am: 03e7db476d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17689977

Change-Id: I33aef21c9226c2599677440f242d64dbd46ee324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:38:56 +00:00
Lee Shombert
56c4310878 Merge "Helper classes for IpcDataCache clients" into tm-dev am: ead48cc667 am: 78f5239fbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542360

Change-Id: Ic88c7ff5335ee8c8cfceb7900d69068cacaf95a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:36:57 +00:00
Pavel Grafov
2d62a70bd3 Merge "Fix DPMS unit tests." into tm-dev am: 4d35e771f4 am: 717ec3790c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695641

Change-Id: Ibfbec024ecd5ce70724a89ece62cc019dee1da6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:36:35 +00:00
TreeHugger Robot
0b0d10756d Merge "Fix typo in dumpsys for GnssAntennaInfoProvider" into tm-dev am: 7359720a2d am: 314c9200d9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17698248

Change-Id: I5779dd51e0059a07c1609bf93fb122f28a828edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:36:07 +00:00
Calvin Pan
20de1e329b Merge "Add current system language into suggestion list" into tm-dev am: 895a7b661e am: 58c93e457f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17700590

Change-Id: Ib587a44e8123bbf7a30131fc9b6633fe33ecce8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:35:55 +00:00
Fabian Kozynski
a003fff80a Merge "Don't crash TileService app when systemui crashes" into tm-dev am: 4ae15e81bc am: c7089357f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694868

Change-Id: Id07fa155a7f74a0c53d4aeeee27794026e64653e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:35:27 +00:00
Jorim Jaggi
68b35909a2 Merge "Fix doc issue linking internal class" into tm-dev am: 331f163d20 am: a33a8fbe94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693836

Change-Id: I0c4935e812c847695813458398991a4b59c4f6c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 10:35:07 +00:00
TreeHugger Robot
eca6e52fdb Merge "[conflict] Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev am: 721634a9ec am: 27cd4eaa56" into tm-qpr-dev 2022-04-13 10:30:43 +00:00
Chris Li
0d8643a4c0 [conflict] Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev am: 721634a9ec am: 27cd4eaa56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17696010

Change-Id: I9ece7336b748fab06e1415edb7ebbb3db20cf51e
Merged-In: Iaf7e57cdc7aa9d55a600e166757b3b07ca708f05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-13 06:24:37 +00:00
Evan Rosky
f7369c8bc4 Merge "Add a DefaultMixedHandler handler combined transitions" into tm-qpr-dev 2022-04-12 19:24:35 +00:00
Michał Brzeziński
b758be6a5f Merge "Adjusting bottom QQS padding in large screen shade" into tm-dev am: c161367148 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693924

Change-Id: I1775026b36161a5f8f91456ec2c16b96622bc164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 15:42:34 +00:00
Michał Brzeziński
c161367148 Merge "Adjusting bottom QQS padding in large screen shade" into tm-dev 2022-04-12 15:17:18 +00:00
Mark Renouf
d46bf5c5d7 Merge "Fix potential StrictMode crash with miniresolver" into tm-dev am: 05709ae494 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17621331

Change-Id: I44c2edf35c7796e47e4c3cd57f61fbe0028c062d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 15:00:19 +00:00
Mark Renouf
05709ae494 Merge "Fix potential StrictMode crash with miniresolver" into tm-dev 2022-04-12 14:53:55 +00:00
Beth Thibodeau
03e7db476d Merge "Revert "Enable media session flag by default"" into tm-dev am: d39f10737c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17689977

Change-Id: I72e32c02413f2ed3d48cf8691e1ab6d0fb0ec563
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 14:45:04 +00:00
Beth Thibodeau
d39f10737c Merge "Revert "Enable media session flag by default"" into tm-dev 2022-04-12 14:37:46 +00:00
Lee Shombert
78f5239fbe Merge "Helper classes for IpcDataCache clients" into tm-dev am: ead48cc667 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17542360

Change-Id: Ie89ccc66031aa06107d4a524446fed17fed7cb2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 14:37:35 +00:00
Lucas Silva
1097ed3c96 Merge "Fix issue where back button causes shade to appear over bouncer." into tm-qpr-dev 2022-04-12 14:32:33 +00:00
Lee Shombert
ead48cc667 Merge "Helper classes for IpcDataCache clients" into tm-dev 2022-04-12 14:32:31 +00:00
Pavel Grafov
717ec3790c Merge "Fix DPMS unit tests." into tm-dev am: 4d35e771f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17695641

Change-Id: I0d69be84a26a9ca0f87fc39354ec0f0ed0de1858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 14:24:13 +00:00
TreeHugger Robot
314c9200d9 Merge "Fix typo in dumpsys for GnssAntennaInfoProvider" into tm-dev am: 7359720a2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17698248

Change-Id: I56713622d825770b4052bb3e5cfe1877b6f710b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 14:23:18 +00:00
Pavel Grafov
4d35e771f4 Merge "Fix DPMS unit tests." into tm-dev 2022-04-12 14:17:16 +00:00
TreeHugger Robot
7359720a2d Merge "Fix typo in dumpsys for GnssAntennaInfoProvider" into tm-dev 2022-04-12 14:16:12 +00:00
Calvin Pan
58c93e457f Merge "Add current system language into suggestion list" into tm-dev am: 895a7b661e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17700590

Change-Id: I9f87e3b7618b605c2a1dc812baa729ec2e3a1f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 14:15:17 +00:00
Calvin Pan
895a7b661e Merge "Add current system language into suggestion list" into tm-dev 2022-04-12 13:55:29 +00:00
Fabian Kozynski
c7089357f9 Merge "Don't crash TileService app when systemui crashes" into tm-dev am: 4ae15e81bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17694868

Change-Id: Id7c4fd8e05aa22ee0a6f892ec198d17aab5c6ece
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 13:35:27 +00:00
Fabian Kozynski
4ae15e81bc Merge "Don't crash TileService app when systemui crashes" into tm-dev 2022-04-12 13:16:54 +00:00
Jorim Jaggi
a33a8fbe94 Merge "Fix doc issue linking internal class" into tm-dev am: 331f163d20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17693836

Change-Id: I29347f45e3ca2902d321e196d58bcc9888263cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:59:20 +00:00
TreeHugger Robot
b553c92aa4 Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev am: ab0c667365 am: 78a97c8dcc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16973066

Change-Id: I048e88e084a7b3562e89db6ebe02a2a524c51ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:58:05 +00:00
Jorim Jaggi
331f163d20 Merge "Fix doc issue linking internal class" into tm-dev 2022-04-12 12:50:54 +00:00
Chris Li
27cd4eaa56 Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev am: 721634a9ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17696010

Change-Id: Id7f1412adb8789a839703421c4c42e052664644d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:43:06 +00:00
Chris Li
721634a9ec Merge "Fix untrusted embedding visibility in multi windowing mode" into tm-dev 2022-04-12 12:37:16 +00:00
TreeHugger Robot
78a97c8dcc Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev am: ab0c667365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16973066

Change-Id: Ib22e05f5e64dbbd9e58da287947c67e1d23db8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:36:35 +00:00
TreeHugger Robot
ab0c667365 Merge "Fixed that the camera will not be blocked on the virtual display in special cases" into tm-dev 2022-04-12 12:21:47 +00:00
Jing Ji
65cab7b9f9 Merge "Update the text of background app battery usage notification." into tm-dev am: 885af3d522 am: 5c28c0a01b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697827

Change-Id: Ib92ccb89d91e76da5d5716d7ed31d45e70563955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 12:07:25 +00:00
Jing Ji
5c28c0a01b Merge "Update the text of background app battery usage notification." into tm-dev am: 885af3d522 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17697827

Change-Id: I199e56cf08e4d1acdd3bf6d105a47a5779d7bde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:45:54 +00:00
Julia Reynolds
2c544ff59a Merge "Modify handling of notifs with invalid sounds" into tm-dev am: 08f603903c am: 4b3debf652 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665297

Change-Id: Ia8e632d44d0c1f3bb1576a6d1f3335b15221cc5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:38:24 +00:00
Jing Ji
885af3d522 Merge "Update the text of background app battery usage notification." into tm-dev 2022-04-12 11:29:28 +00:00
Julia Reynolds
4b3debf652 Merge "Modify handling of notifs with invalid sounds" into tm-dev am: 08f603903c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665297

Change-Id: I562e1ecba2dcbeefacce87345fc554cd0316dda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 11:17:57 +00:00
Pavel Grafov
4eefc3152c Fix DPMS unit tests. 
Currently these tests fail because of an attempt to register the same
service more than once in a static map, which leads to an exception.
Make DevicePolicyManagerTestable unregister them before constructing
DPMS, so that it doesn't have to be done in every test.

Bug: 228842216
Test: atest com.android.server.devicepolicy
Change-Id: I43d10193779edf7909d77863f13ecdccfa383473
 2022-04-12 12:15:27 +01:00
Julia Reynolds
08f603903c Merge "Modify handling of notifs with invalid sounds" into tm-dev 2022-04-12 11:02:03 +00:00
Michał Brzeziński
807b2b19ec Merge "Moving brightness slider lower in split shade" into tm-dev am: cd2ba60978 am: 5416b91312 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619728

Change-Id: Id07344728963a3e83ebb37b123164906d325baff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:32:49 +00:00
Michał Brzeziński
5416b91312 Merge "Moving brightness slider lower in split shade" into tm-dev am: cd2ba60978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17619728

Change-Id: Ie2d84fd566c615ae1d9088f40810a4d45eaff16b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:32:12 +00:00
TreeHugger Robot
2f66cacb84 Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev am: 217edfa93b am: 4fd0ff86b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518065

Change-Id: Ic1e1f2d161596de7257a3aba0a37c5d3e2ea74f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:31:59 +00:00
Michał Brzeziński
cd2ba60978 Merge "Moving brightness slider lower in split shade" into tm-dev 2022-04-12 10:15:23 +00:00
TreeHugger Robot
4fd0ff86b2 Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev am: 217edfa93b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518065

Change-Id: I38613dcb05df4eb4a7e6d04816b9a1e8a08ab127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 10:10:09 +00:00
TreeHugger Robot
217edfa93b Merge "SIM slot not available error code added to UpdateAvailableNetworksResult" into tm-dev 2022-04-12 09:49:49 +00:00
Jacqueline Bronger
be8ba94822 Merge "Fix gravity after re-enabling expanded PiP" into tm-dev am: 6cc02e8d74 am: 809566f868 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17570468

Change-Id: I1c71d0da42cb2094dd9e7e1995401aca042097d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-12 09:49:12 +00:00