Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d am: 6c75038336

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9103e40a248ef3bbdd0f758aebe0b5e21e4372c
This commit is contained in:
Treehugger Robot
2021-01-21 07:22:47 +00:00
committed by Automerger Merge Worker
parent 0397559e6f 6c75038336
commit e431563a7c
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -126,6 +126,7 @@ package android {
field public static final String MANAGE_SENSOR_PRIVACY = "android.permission.MANAGE_SENSOR_PRIVACY"; field public static final String MANAGE_SENSOR_PRIVACY = "android.permission.MANAGE_SENSOR_PRIVACY";
field public static final String MANAGE_SOUND_TRIGGER = "android.permission.MANAGE_SOUND_TRIGGER"; field public static final String MANAGE_SOUND_TRIGGER = "android.permission.MANAGE_SOUND_TRIGGER";
field public static final String MANAGE_SUBSCRIPTION_PLANS = "android.permission.MANAGE_SUBSCRIPTION_PLANS"; field public static final String MANAGE_SUBSCRIPTION_PLANS = "android.permission.MANAGE_SUBSCRIPTION_PLANS";
field public static final String MANAGE_TEST_NETWORKS = "android.permission.MANAGE_TEST_NETWORKS";
field public static final String MANAGE_USB = "android.permission.MANAGE_USB"; field public static final String MANAGE_USB = "android.permission.MANAGE_USB";
field public static final String MANAGE_USERS = "android.permission.MANAGE_USERS"; field public static final String MANAGE_USERS = "android.permission.MANAGE_USERS";
field public static final String MANAGE_USER_OEM_UNLOCK_STATE = "android.permission.MANAGE_USER_OEM_UNLOCK_STATE"; field public static final String MANAGE_USER_OEM_UNLOCK_STATE = "android.permission.MANAGE_USER_OEM_UNLOCK_STATE";

2
core/api/test-current.txt
View File

@@ -981,7 +981,7 @@ package android.media.tv {
package android.net { package android.net {
public class ConnectivityManager { public class ConnectivityManager {
method @RequiresPermission(anyOf={"android.permission.MANAGE_TEST_NETWORKS", android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_TEST_NETWORKS, android.Manifest.permission.NETWORK_STACK}) public void simulateDataStall(int, long, @NonNull android.net.Network, @NonNull android.os.PersistableBundle);
} }
public class EthernetManager { public class EthernetManager {

2
core/res/AndroidManifest.xml
View File

@@ -1631,7 +1631,7 @@
<permission android:name="android.permission.MANAGE_IPSEC_TUNNELS" <permission android:name="android.permission.MANAGE_IPSEC_TUNNELS"
android:protectionLevel="signature|appop" /> android:protectionLevel="signature|appop" />
<!-- @hide Allows apps to create and manage Test Networks. <!-- @SystemApi @hide Allows apps to create and manage Test Networks.
<p>Granted only to shell. CTS tests will use <p>Granted only to shell. CTS tests will use
UiAutomation.AdoptShellPermissionIdentity() to gain access. UiAutomation.AdoptShellPermissionIdentity() to gain access.
--> -->