Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
752,137 Commits 3 Branches 0 Tags
aa61eeefa7a5a90f4d277c8a134ba697a44a4dcb
Commit Graph

752137 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacqueline Bronger
aa61eeefa7 Merge "Add symmetric Getters to PictureInPictureParams" into tm-dev 2022-03-16 14:48:19 +00:00
Shaowei Shen
be65de9fc0 Merge "DO NOT MERGE: Downbranch merge conflict[Output Swithcer] Update color" into tm-dev 2022-03-16 14:17:24 +00:00
Christian Göllner
387d9ee331 Merge "[Split-shade] Set keyguard status bar height to match spec and height of split-shade header" into tm-dev 2022-03-16 14:12:33 +00:00
Andrei-Valentin Onea
61189993a0 Merge "Revert^2 "Move out allowlists for com.android.cellbroadcast"" into tm-dev 2022-03-16 14:05:43 +00:00
Steve Elliott
fcf5da1a07 Merge "Fix incorrect RemoteInput result source" into tm-dev 2022-03-16 13:57:03 +00:00
Caitlin Cassidy
3a6360c11d Merge "[Media TTT] Use the cast icon as a fallback if we can't get the app icon for some reason." into tm-dev 2022-03-16 13:47:36 +00:00
Frank Li
682c05e0f0 Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: c48d90e91b am: acb77010ac am: 858f0d75e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I7e5dc71e1705a7c205c0fd6a7cb57e75cae5a4fc
 2022-03-16 13:20:10 +00:00
Frank Li
858f0d75e4 Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: c48d90e91b am: acb77010ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I289823436cda3561d76f4c1421201315e0b26638
 2022-03-16 13:19:34 +00:00
Frank Li
acb77010ac Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: c48d90e91b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I95ac7442751dca1f4e469edbe950b38aca6c720a
 2022-03-16 12:54:39 +00:00
TreeHugger Robot
13d7efe1e0 [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours am: ba634e4a67 -s ours am: 3d4721836e -s ours am: 7cc0fa7a5c -s ours am: db054c59bd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3009cec9cfa790f5e848f3a24df1d0a2cf0f0c5
 2022-03-16 12:42:52 +00:00
Jeff Chang
4998cb5491 [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours am: eb8a1d4be9 -s ours am: f049970f9c -s ours am: e850eabe67 -s ours am: aeadd33603 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23aeeeba46bc314e4d46c7d004f7026a0b6d485b
 2022-03-16 12:42:26 +00:00
Frank Li
c48d90e91b Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" 2022-03-16 12:28:24 +00:00
TreeHugger Robot
db054c59bd [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours am: ba634e4a67 -s ours am: 3d4721836e -s ours am: 7cc0fa7a5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79b0f0b2309d466967d79eb0cc56203b7d48df28
 2022-03-16 12:18:14 +00:00
Jeff Chang
aeadd33603 [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours am: eb8a1d4be9 -s ours am: f049970f9c -s ours am: e850eabe67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e86c9a73668558f5f54239b10fd87ed9c23616d
 2022-03-16 12:17:52 +00:00
TreeHugger Robot
4f75d8cc24 [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours am: ba634e4a67 -s ours am: 7330f43464 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaeeaa49e71dc3d01a3db99eaaf57cf15f0c4f3bd
 2022-03-16 11:55:57 +00:00
TreeHugger Robot
7cc0fa7a5c [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours am: ba634e4a67 -s ours am: 3d4721836e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I82df76b08eee892b313ce99642aedf4ead85b0f5
 2022-03-16 11:55:43 +00:00
Jeff Chang
e850eabe67 [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours am: eb8a1d4be9 -s ours am: f049970f9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47202db2250cb8ef901f54c9dceb1041f857c114
 2022-03-16 11:55:39 +00:00
Jeff Chang
fd78637754 [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours am: eb8a1d4be9 -s ours am: e49957fb9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6be097123fdf2fa7469abd96f9c600a234b2fc68
 2022-03-16 11:55:39 +00:00
Miguel Aranda
f9b72c1f9e Merge "Revert "Use compat framework to gate session actions"" into tm-dev 2022-03-16 11:45:14 +00:00
Miguel Aranda
da972b8c71 Revert "Use compat framework to gate session actions" 
Revert "Update media flag descriptions"

Revert submission 17161599-b220034304-media-compat

Reason for revert: This seems to cause the break in b/224895002
BUG: 224895002
Reverted Changes:
Ifeecb4e13:Update media flag descriptions
Ie032fe9ec:Use compat framework to gate session actions

Change-Id: I8b309a69282f41b4a45bd82bd3dcc9f85751da7e
 2022-03-16 11:34:51 +00:00
TreeHugger Robot
3d4721836e [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours am: ba634e4a67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18eb35713934dcdb5314d3df10df6609c876f31c
 2022-03-16 11:31:52 +00:00
Jeff Chang
f049970f9c [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours am: eb8a1d4be9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I533d5cfedb65b16deffee56c42626d58ca00f4ed
 2022-03-16 11:31:50 +00:00
TreeHugger Robot
7330f43464 [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours am: ba634e4a67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I37bfe0c92dd6117c2b07867a39c190e2a6735936
 2022-03-16 11:30:58 +00:00
Jeff Chang
e49957fb9e [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours am: eb8a1d4be9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4eec4a1728e33b9edd003ef5ea6dbea66fb910a3
 2022-03-16 11:30:52 +00:00
TreeHugger Robot
ba634e4a67 [automerger skipped] Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b am: b359403e39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7e1b57f5baaaca3fec0a4c8d891ed004eace514
 2022-03-16 11:07:06 +00:00
Jeff Chang
eb8a1d4be9 [automerger skipped] [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 am: bf71c0255c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6773afbe3093d1d900b029c63975cd715bfd2aab
 2022-03-16 11:06:44 +00:00
TreeHugger Robot
b359403e39 Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev am: b52cedd04b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961349

Change-Id: I12c5cc50e904965db8d84f89c00dc3c02f29ccdc
 2022-03-16 10:43:04 +00:00
Jeff Chang
bf71c0255c [RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity am: 7221a25a03 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16961349

Change-Id: I84aedd95be01bec2daf057af34d31c9220e8a27c
 2022-03-16 10:42:48 +00:00
Issei Suzuki
0f77c42f4d Merge "Defer destroying surface while exit animation is running for shell." into tm-dev 2022-03-16 10:19:45 +00:00
TreeHugger Robot
b52cedd04b Merge "[RESTRICT AUTOMERGE]Only allow system and same app to apply relinquishTaskIdentity" into rvc-dev 2022-03-16 10:16:14 +00:00
Samiul Islam
9bdc17bb2a Merge "Create system API for reconciling sub directories of sdk data" into tm-dev 2022-03-16 10:05:53 +00:00
Kholoud Mohamed
caf50b5f9d Merge "Add API to check if device policy role qualification is bypassable" into tm-dev 2022-03-16 09:45:21 +00:00
SongFerng Wang
83addbff50 Merge "Add the API to get the AudioLocation" into tm-dev 2022-03-16 09:44:42 +00:00
Vania Desmonda
5128c76995 Merge "Allow UiMode adb shell command to override night mode custom type. Add night mode custom type information in UiMode dumpsys." into tm-dev 2022-03-16 09:05:15 +00:00
Sarah Chin
c5ef660e77 Merge "Revert "Add data fail cause for empty TD list"" into tm-dev 2022-03-16 07:49:38 +00:00
Milton Wu
a496063284 Merge "Finetune LOCKSCREEN_TRANSITION_FROM_AOD CUJ" into tm-dev 2022-03-16 06:52:36 +00:00
Frank
7c43d8fcac [DU04-2]Appropriate changes to the NetworkPolicyManager API 
Divide the NetworkPolicyManager API
notifyStatsProviderWarningOrLimitReached into the following two APIs:
1. notifyStatsProviderWarningReached()
2. notifyStatsProviderLimitReached()

Bug: 216474563
Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest
            NetworkPolicyManagerServiceTest OffloadControllerTest
Change-Id: Ic413eb532b5e24d4a7e2afabdcf643ab6607b1ed
 2022-03-16 14:23:50 +08:00
Joshua Mccloskey
807d81e0a0 Merge "BiometricPrompt calls correct cam privacy API." into tm-dev 2022-03-16 05:40:40 +00:00
Ming-Shin Lu
cc811102a6 Merge "Add Intrsumentation#resetInTouchMode for instrumenting" into tm-dev 2022-03-16 05:11:24 +00:00
Sewook Seo
f13eb56fc4 Merge "API review: Additional comment for QosApi." am: 634b3fec76 am: 6b3f890916 am: e427133c27 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019630

Change-Id: I36ec3a02fc678021b70b7bcd520f8a359bfb4dee
 2022-03-16 04:41:20 +00:00
Sewook Seo
e427133c27 Merge "API review: Additional comment for QosApi." am: 634b3fec76 am: 6b3f890916 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019630

Change-Id: Ic903c0dcd7c843e841126512f723a4742ce3f7a3
 2022-03-16 04:19:16 +00:00
Tiger Huang
d943f85a2a Merge "Remove RELAYOUT_RES_IN_TOUCH_MODE" into tm-dev 2022-03-16 04:05:42 +00:00
Sewook Seo
6b3f890916 Merge "API review: Additional comment for QosApi." am: 634b3fec76 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019630

Change-Id: Id188f5f6dd8fe26e3c3b37da0319faf05d556ba6
 2022-03-16 03:52:34 +00:00
Sarah Chin
271e0b6d0a Revert "Add data fail cause for empty TD list" 
Revert "Deactivate data network if TDs are empty"

Revert submission 17146764-deactivate_no_tds

Reason for revert: Internet broken
Reverted Changes:
I6dd9d3e01:Add data fail cause for empty TD list
I3b474e10f:Deactivate data network if TDs are empty

Change-Id: I43bcb551bbb8775ed489822ca3ad3fe3af7e9c0b
 2022-03-16 03:33:16 +00:00
Yomna Nasser
0e3f74dbf4 Merge "Change default value of KEY_PREFER_2G_BOOL." into tm-dev 2022-03-16 03:30:02 +00:00
Hui Wu
0cbab392ff Merge "handle java.lang.NullPointerException" into tm-dev 2022-03-16 03:25:04 +00:00
Sewook Seo
634b3fec76 Merge "API review: Additional comment for QosApi." 2022-03-16 03:20:55 +00:00
Charles Chen
c36d7e4faa Merge "Fix placeholder not shown after launch again" into tm-dev 2022-03-16 02:36:46 +00:00
Tom Hsu
e81d58ebb1 Merge "Revert "[Panlingual] Turn off switch flag for BETA1"" into tm-dev 2022-03-16 02:36:29 +00:00
Menghan Li
005057673d Merge "Allow Accessibility features don't need summary, intro, and description" into tm-dev 2022-03-16 02:33:31 +00:00