diff options
| author | 2021-01-21 07:01:13 +0000 | |
|---|---|---|
| committer | 2021-01-21 07:01:13 +0000 | |
| commit | 6c750383366e37b03ab52b3247a8d2f548d39bf0 (patch) | |
| tree | 95eed936ff30c5e4fdc270c9ddf9b41b7c32ffd5 | |
| parent | ae781e1b303873a5adcacaf71bb250b1bbc48c13 (diff) | |
| parent | 2a0f125d7d10438cf625feff4151fd23d97b2ecb (diff) | |
Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552176
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I23b6f3e472bd1408b9674e48f046e8cd6c64d8b2
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 064dfc3d6eb5..cef201f86ca7 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -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_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_TEST_NETWORKS = "android.permission.MANAGE_TEST_NETWORKS"; 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_USER_OEM_UNLOCK_STATE = "android.permission.MANAGE_USER_OEM_UNLOCK_STATE"; diff --git a/core/api/test-current.txt b/core/api/test-current.txt index ba60e2175f54..715a099fca4f 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -981,7 +981,7 @@ package android.media.tv { package android.net { 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 { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index bd48e57eb67c..2756bd95cb01 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1624,7 +1624,7 @@ <permission android:name="android.permission.MANAGE_IPSEC_TUNNELS" 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 UiAutomation.AdoptShellPermissionIdentity() to gain access. --> |