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

Add MANAGE_TEST_NETWORKS to system API

Browse Source 
The system and particularly mainline modules need to reference the API
constant so they can verify that callers have the permission.

Bug: 174436414
Test: m
Change-Id: I9f41f888fbd4b7605d750110b345005a5cba85d1
This commit is contained in:
Remi NGUYEN VAN
2021-01-15 22:06:20 +09:00
parent 37ff65366e
commit 0d00aef643
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

@@ -135,6 +135,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_TIME_AND_ZONE_DETECTION = "android.permission.MANAGE_TIME_AND_ZONE_DETECTION"; field public static final String MANAGE_TIME_AND_ZONE_DETECTION = "android.permission.MANAGE_TIME_AND_ZONE_DETECTION";
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";

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

@@ -1150,7 +1150,7 @@ package android.media.tv.tuner {
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

@@ -1688,7 +1688,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.
--> -->