Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c750383 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add MANAGE_TEST_NETWORKS to system API" am: 2a0f125d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23b6f3e472bd1408b9674e48f046e8cd6c64d8b2
parents ae781e1b 2a0f125d

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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.

    -->