Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
623,187 Commits 3 Branches 0 Tags
c55f7459eaedcb5faf992dc045e7d562ea1b935e
Commit Graph

623187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jin Seok Park
c55f7459ea Merge "[Media ML] Replace using PendingIntent hidden APIs" into sc-dev 2021-02-08 19:38:23 +00:00
Ben Lin
c8227c58fa Merge "Pass ActivityOptions to HeavyWeightSwitcherAcivity." into sc-dev 2021-02-08 19:28:12 +00:00
TreeHugger Robot
32906bfbbd Merge "Correct colors on forcibly decorated custom notifications" into sc-dev 2021-02-08 19:17:47 +00:00
Chris Li
de6aadf262 Merge "Include whether in touch mode for WindowlessWindowManager" into sc-dev 2021-02-08 19:17:28 +00:00
TreeHugger Robot
2fa12f8ec3 Merge "Add vibrator state listener support for input device vibrator" into sc-dev 2021-02-08 19:05:34 +00:00
Danning Chen
8bdb6c350d Merge "Expose onNotificationChannelModified() callback to NotificationAssistantService" into sc-dev 2021-02-08 18:46:36 +00:00
Christian Frank
94d2b53e62 Merge "Add MANAGE_MUSIC_RECOGNITION to privapp permissions." into sc-dev 2021-02-08 18:40:18 +00:00
TreeHugger Robot
cfe09d4e22 [automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours am: 2fffbcb7df -s ours am: a5ab8308f4 -s ours 
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0425623f67c9b1913375adabcb04cf04b5147306
 2021-02-08 18:35:21 +00:00
TreeHugger Robot
98ed521f0a Merge "Adding All Apps CUJs to InteractionJankMonitor" into sc-dev 2021-02-08 18:31:11 +00:00
Ahaan Ugale
dba0fb5580 Merge "Fix ellipsis reinitialization for static cached StaticLayout." into sc-dev 2021-02-08 18:08:59 +00:00
Ahaan Ugale
fb51ab6667 Merge "Fix DynamicLayout init to use transformed text length." into sc-dev 2021-02-08 18:08:59 +00:00
Evan Rosky
60cdb18a86 Merge "Don't send configuration updates to apps that are going-away" into sc-dev 2021-02-08 18:08:02 +00:00
Janis Danisevskis
9741311bc4 Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 am: 4b875e5524 am: fccde53e0a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1e8eda85dc9c415fea10a23f345d94da8b2290
 2021-02-08 17:50:49 +00:00
Jeff Sharkey
5a0c28dcf6 Merge "Add resource owners" am: d25ad6a116 am: 80382deadc am: 5195eb9abe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ac2127766ab9f24ab3110c08a94ebba25b4d00f
 2021-02-08 17:50:22 +00:00
Brian Stack
0ce36a8533 Merge "Fix log message errors in RangingManager" am: bf50d92faa am: f6ca5649ec am: f5101dbcd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578024

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie91414c8c8002f9a01d2131ee1d0a6174150dfc2
 2021-02-08 17:50:02 +00:00
Treehugger Robot
1c5e6d441a [automerger skipped] Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09 am: b371a1c255 -s ours 
am skip reason: Change-Id I0e58b6924744590afaadec6a6230aa9d552b2f6f with SHA-1 eb05e6c8fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ede05eea2a25b326bc30fac38d9c5d0771ea0a4
 2021-02-08 17:49:31 +00:00
Treehugger Robot
401b7edef8 [automerger skipped] Merge "preloaded-classes-denylist: remove retired class" am: 4d20423db6 am: cc5b9eac70 am: 3f67e3eef5 -s ours 
am skip reason: Change-Id I94122241dc4cef84524ca83513a68d1fa8ffbe65 with SHA-1 1653aba6bf is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf9351de97536727a7a71352efdbcced5d4d5423
 2021-02-08 17:48:55 +00:00
TreeHugger Robot
a5ab8308f4 [automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours am: 2fffbcb7df -s ours 
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51c19517a358f1f8cc69bdf18f00d99cdf05c573
 2021-02-08 17:48:54 +00:00
Nicholas Ambur
54bc816697 Merge "add shell user allowlist perms for Asistant GTS" into sc-dev 2021-02-08 17:48:06 +00:00
Janis Danisevskis
fccde53e0a Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 am: 4b875e5524 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46e4bf75482d4366fa852ce0708483beddd32fdd
 2021-02-08 17:47:26 +00:00
Jeff Sharkey
5195eb9abe Merge "Add resource owners" am: d25ad6a116 am: 80382deadc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d3562d61b9a663a5911df18230867652d56ce51
 2021-02-08 17:46:50 +00:00
Janis Danisevskis
4b875e5524 Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I34799d5a4dc9172b69d0d21400e21f8c5a698bdc
 2021-02-08 17:26:53 +00:00
Brian Stack
f5101dbcd7 Merge "Fix log message errors in RangingManager" am: bf50d92faa am: f6ca5649ec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578024

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If98e511ae6d46e784381a4a5279beec16e2084a7
 2021-02-08 17:24:11 +00:00
Treehugger Robot
b371a1c255 Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 am: 756d229f09 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dabacbcd75c98ab81f933ba03f8f97720ba69b6
 2021-02-08 17:23:55 +00:00
Treehugger Robot
3f67e3eef5 Merge "preloaded-classes-denylist: remove retired class" am: 4d20423db6 am: cc5b9eac70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2189e84c3368290260f10f4054dc7cb09f84ab2
 2021-02-08 17:23:23 +00:00
TreeHugger Robot
2fffbcb7df [automerger skipped] Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0f0 -s ours 
am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea7448 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409002a313787764b16cb23080c38e9273104638
 2021-02-08 17:23:08 +00:00
Jeff Sharkey
80382deadc Merge "Add resource owners" am: d25ad6a116 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccb44fae12908c3539253399e76aa00993f62777
 2021-02-08 17:19:38 +00:00
Brian Stack
f6ca5649ec Merge "Fix log message errors in RangingManager" am: bf50d92faa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578024

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7359dad957f1752a0b70eec6f75f7f7de359731
 2021-02-08 17:11:07 +00:00
Treehugger Robot
756d229f09 Merge "Do not propogate test api access flags to Zygote." am: 39d22680c9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1558556

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb82bc1e90eb882f853155641b9047142737728c
 2021-02-08 17:07:44 +00:00
TreeHugger Robot
6d4ff2e0f0 Merge "resolve merge conflicts of a13fc7f314 to qt-qpr1-dev" into qt-qpr1-dev 2021-02-08 17:00:32 +00:00
Janis Danisevskis
14a82f7983 Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." 2021-02-08 16:52:16 +00:00
Treehugger Robot
cc5b9eac70 Merge "preloaded-classes-denylist: remove retired class" am: 4d20423db6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580046

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37ef594adc33d5d51f49e9f07b0a54f7859e4622
 2021-02-08 16:48:46 +00:00
Rafal Slawik
64454600c6 Merge "Check if CPU time tracking is expected to work" into sc-dev 2021-02-08 16:44:23 +00:00
TreeHugger Robot
2c3254c775 Merge "am compat reset --no-kill shouldn't kill the process" into sc-dev 2021-02-08 16:34:41 +00:00
TreeHugger Robot
aa3477c5a8 Merge "Fixes various failing cts" into sc-dev 2021-02-08 16:25:13 +00:00
Jeff Sharkey
d25ad6a116 Merge "Add resource owners" 2021-02-08 16:23:26 +00:00
Todd Kennedy
ce6c266d1a Add resource owners 
Change-Id: I182d6b167ed33fa0d817e70c7811aa6a22840a69
 2021-02-08 16:20:28 +00:00
Brian Stack
bf50d92faa Merge "Fix log message errors in RangingManager" 2021-02-08 16:11:59 +00:00
Lorenzo Colitti
8416b02cd2 Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager." am: dbe68e90d7 am: 68bf6fa1bb am: 5cd8ec1a1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44a9b9dd67604f7f5275bb0ceeea1be41d9e587a
 2021-02-08 15:57:18 +00:00
TreeHugger Robot
d48e28a9f4 Merge "Fix permission check bypass in IMMS#dump()" into sc-dev 2021-02-08 15:56:46 +00:00
Eric Laurent
25ffe6ce31 Merge "AudioPlaybackConfiguration: add audio session ID" into sc-dev 2021-02-08 15:47:39 +00:00
Danning Chen
c25977ad0d Expose onNotificationChannelModified() callback to NotificationAssistantService 
Change-Id: I71a72298ed1bbd905ed3b35b67964e1f113b7bc0
Test: manual - verify the new method is called in NAS
Bug: 179520528
Bug: 163614153
 2021-02-08 07:43:46 -08:00
Lorenzo Colitti
5cd8ec1a1f Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager." am: dbe68e90d7 am: 68bf6fa1bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I531092f442268da8396c7619b6f8acc05f6724a4
 2021-02-08 15:28:22 +00:00
Treehugger Robot
39d22680c9 Merge "Do not propogate test api access flags to Zygote." 2021-02-08 15:27:19 +00:00
Treehugger Robot
4d20423db6 Merge "preloaded-classes-denylist: remove retired class" 2021-02-08 15:10:57 +00:00
Lorenzo Colitti
68bf6fa1bb Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager." am: dbe68e90d7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574868

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa46f6685b840a5993f86e1856f1e35c5726f0fd
 2021-02-08 14:51:09 +00:00
Lorenzo Colitti
dbe68e90d7 Merge "Switch VpnDialogs from IConnectivityManager to IVpnManager." 2021-02-08 14:09:09 +00:00
Orion Hodson
a6ae10c486 Merge "preloaded-classes-denylist: remove retired class" into sc-dev 2021-02-08 13:30:11 +00:00
Orion Hodson
cd272e3402 preloaded-classes-denylist: remove retired class 
Remove com.android.server.BootReceiver$2 from the denylist as this
anonymous class was retired in change https://r.android.com/1565971.

(cherry picked from commit 1653aba6bf)

Bug: 159164105
Bug: 179645293
Test: atest PreloadCheck
Change-Id: I94122241dc4cef84524ca83513a68d1fa8ffbe65
Merged-In: I94122241dc4cef84524ca83513a68d1fa8ffbe65
 2021-02-08 13:24:41 +00:00
Alex Kershaw
18e496433d Merge "Revert "Enfore cross user permission to getPackagesForUid"" into sc-dev 2021-02-08 13:00:59 +00:00