Commit Graph

623134 Commits

Author SHA1 Message Date
Nicholas Ambur
54bc816697 Merge "add shell user allowlist perms for Asistant GTS" into sc-dev 2021-02-08 17:48:06 +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
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
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
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
Alex Kershaw
18e496433d Merge "Revert "Enfore cross user permission to getPackagesForUid"" into sc-dev 2021-02-08 13:00:59 +00:00
Lorenzo Colitti
025a7336d0 Merge changes I4256ca5f,I91528e1a,I48bd594c am: be331ab3a7 am: 22679c8f68 am: 1ea2b93620
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7201b62010a56962a16a89bb43cbde75cda22e14
2021-02-08 12:13:23 +00:00
Chiachang Wang
caf94b9f5a Merge "Move shared Proxy method and constants to shared lib" am: 385f58bf71 am: 780a72f7e8 am: 2fb35058f8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8bf2cb335d4154749e69147e9c549e1be548e8a3
2021-02-08 12:12:48 +00:00
Orion Hodson
1653aba6bf 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.

Bug: 159164105
Bug: 179645293
Test: atest PreloadCheck
Change-Id: I94122241dc4cef84524ca83513a68d1fa8ffbe65
2021-02-08 11:49:58 +00:00
Jerome Gaillard
09b64443c8 Merge "Add host required arguments to FontFamily_getVariant" into sc-dev 2021-02-08 11:36:48 +00:00
Lorenzo Colitti
1ea2b93620 Merge changes I4256ca5f,I91528e1a,I48bd594c am: be331ab3a7 am: 22679c8f68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5304f83bc029582c2f903669270b713b1678431c
2021-02-08 11:32:13 +00:00
Chiachang Wang
2fb35058f8 Merge "Move shared Proxy method and constants to shared lib" am: 385f58bf71 am: 780a72f7e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a12cbd0101d6cc637f87e524713ba5056ac6e01
2021-02-08 11:31:48 +00:00
Lorenzo Colitti
22679c8f68 Merge changes I4256ca5f,I91528e1a,I48bd594c am: be331ab3a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579985

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic761cd9e8e492bcbde117f2b7de7f995b93ea0e7
2021-02-08 11:21:08 +00:00
Zimuzo Ezeozue
a0735849df Merge "Add AnrController to control ANR dialog delay" into sc-dev 2021-02-08 11:12:50 +00:00
Chiachang Wang
780a72f7e8 Merge "Move shared Proxy method and constants to shared lib" am: 385f58bf71
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574816

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c6ff3c4c82d12334b52871863cc7d6d5c6872c9
2021-02-08 11:00:55 +00:00
Lorenzo Colitti
be331ab3a7 Merge changes I4256ca5f,I91528e1a,I48bd594c
* changes:
  Change ConnectivityServiceTest to prepare for VPN code move.
  Add to VpnManager the VPN APIs used by Settings and SystemUI.
  Remove temporary hack in VpnTest.
2021-02-08 10:41:32 +00:00
Alex Kershaw
d5bc510fc8 Revert "Enfore cross user permission to getPackagesForUid"
This reverts commit 1dafc3859a.

Reason for revert: Causes bugs https://b.corp.google.com/issues/179465628 and https://b.corp.google.com/issues/179506602

Fixes: 179506602
Fixes: 179465628
Fixes: 179460585

Change-Id: I0596e45484638e33baccec834a8adf2dfa9f4a4d
2021-02-08 10:33:54 +00:00
Chiachang Wang
385f58bf71 Merge "Move shared Proxy method and constants to shared lib" 2021-02-08 10:27:05 +00:00
Lorenzo Colitti
a5e942370f Switch VpnDialogs from IConnectivityManager to IVpnManager.
The VPN code is moving out of ConnectivityService to a new
VpnManagerService. Update VpnDialogs to call into the new
service.

Bug: 173331190
Test: builds, boots
Test: atest HostsideVpnTests
Change-Id: I173ed0c3e39afb91c0dde1426dc492e9225afb00
2021-02-08 19:25:40 +09:00
Chiachang Wang
698749b053 Move shared Proxy method and constants to shared lib
The static validate() method an PROXY_* constants in Proxy are
used by both module and Settings. After Proxy is moving into
connectivity module, Setting will not able to access them.
Thus, move them to ProxyUtils in net shared lib.

Bug: 172183305
Test: atest FrameworksNetTests
Test: atest CtsNetTestCases:ProxyInfoTest
Change-Id: I02c88aeaeb53d62b87a42a2d8ead9b140b054650
2021-02-08 10:25:07 +00:00
TreeHugger Robot
ceec07f033 Merge "Remove last transition info after it is logged" into sc-dev 2021-02-08 08:53:27 +00:00
Eric Laurent
f872f163c1 Merge "AudioService: refactor audio mode stack" into sc-dev 2021-02-08 08:27:59 +00:00
TreeHugger Robot
ead7d81ed4 Merge "Add MEDIA_COMMUNICATION_SERVICE in Context.ServiceName" into sc-dev 2021-02-08 08:15:46 +00:00
Treehugger Robot
ce67f9673e Merge "[VCN03] Linger the newly connected network for a short time" am: 648c2e4c98 am: 50f6a2e6f7 am: 209405e894
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I048c81620a3ad4af481c43d27de10f92ca4fb18c
2021-02-08 05:59:15 +00:00
TreeHugger Robot
a3a5ccc8e2 [automerger skipped] Merge "[DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility" into rvc-qpr-dev am: 97bd8baafb am: 5731fc732d -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7aa6b181f05b9bd55ef16c269849f706c747140
2021-02-08 05:58:43 +00:00
Wilson Wu
32b4a22192 [automerger skipped] [DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility am: f03366ee16 am: 6233c2fd13 -s ours
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f481474932c945f86553834cf3e138875003574
2021-02-08 05:58:35 +00:00
Treehugger Robot
209405e894 Merge "[VCN03] Linger the newly connected network for a short time" am: 648c2e4c98 am: 50f6a2e6f7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30d7e79a273436e49331a0cab285c03be32f5390
2021-02-08 05:57:46 +00:00
Chiachang Wang
ae91051ed2 Merge "Create new system API in UserHandle to get uid" am: af6494310d am: 8927357b27 am: 6ec462de05
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia28b9c251b67344c1d4d07a2d600a53ca36b170b
2021-02-08 05:57:39 +00:00
TreeHugger Robot
5731fc732d Merge "[DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility" into rvc-qpr-dev am: 97bd8baafb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13240482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb923622b3ce659ab3f7389146bae44575593779
2021-02-08 05:57:15 +00:00
Wilson Wu
6233c2fd13 [DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility am: f03366ee16
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13240482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ec1f80683a61207f2e6d333ca90ea604bbdcaa0
2021-02-08 05:57:01 +00:00
Treehugger Robot
50f6a2e6f7 Merge "[VCN03] Linger the newly connected network for a short time" am: 648c2e4c98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icabf50b92925fe3bcb5b45e40cc1c696c73e7380
2021-02-08 05:19:15 +00:00
TreeHugger Robot
97bd8baafb Merge "[DO NOT MERGE] DisplayImeController: fix out-of-sync IME visibility" into rvc-qpr-dev 2021-02-08 05:18:37 +00:00
Chiachang Wang
6ec462de05 Merge "Create new system API in UserHandle to get uid" am: af6494310d am: 8927357b27
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31355ce04a22c27bb83793b5664a3f6358fd83d
2021-02-08 05:14:09 +00:00
Jayachandran Chinnakkannu
7d0e92c509 Merge "Add QoS filter matching and unit tests" into sc-dev 2021-02-08 05:13:09 +00:00
Treehugger Robot
648c2e4c98 Merge "[VCN03] Linger the newly connected network for a short time" 2021-02-08 04:57:35 +00:00
Yi Jiang
f8e50bea38 Merge "A few fixes for RotationResolver" into sc-dev 2021-02-08 04:44:05 +00:00
Chiachang Wang
8927357b27 Merge "Create new system API in UserHandle to get uid" am: af6494310d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1573942

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8303c08be1e76ff48e60965518de4d469dc0352
2021-02-08 04:30:03 +00:00
TreeHugger Robot
5a939299b0 Merge "Remove unncessary attachedToWindow check" into sc-dev 2021-02-08 04:18:49 +00:00
Xiao Ma
c9efb465a0 Merge "Allow connectivity namespace to enable native level access flags." am: 988d3f818b am: fe5578dc35 am: b2c31eab15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5cbb15e03f033988b21c9ab013c4afb56569ed61
2021-02-08 04:17:29 +00:00
Chiachang Wang
af6494310d Merge "Create new system API in UserHandle to get uid" 2021-02-08 03:56:39 +00:00
Xiao Ma
b2c31eab15 Merge "Allow connectivity namespace to enable native level access flags." am: 988d3f818b am: fe5578dc35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81152c07f67c5bf7c35158c7317cfba69ab483d2
2021-02-08 03:39:39 +00:00
Xiao Ma
fe5578dc35 Merge "Allow connectivity namespace to enable native level access flags." am: 988d3f818b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569746

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1495e09f48fe5ac9c68002ef35772223628f4c3a
2021-02-08 02:57:41 +00:00
Hyundo Moon
05766bfb98 Add MEDIA_COMMUNICATION_SERVICE in Context.ServiceName
Bug: 175511943
Test: Builds successfully
Change-Id: I3065e3fa57339bd81e5e5f5ade1493edd12324c5
2021-02-08 11:12:18 +09:00
Xiao Ma
988d3f818b Merge "Allow connectivity namespace to enable native level access flags." 2021-02-08 01:40:51 +00:00