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

Commit 6b2f6b1e authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c2 

am: aab9359c

Change-Id: I8049e2484526104eba7fad92d2819eb94319fa84
parents f2183961 aab9359c

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ package android { 
    field public static final java.lang.String MOUNT_FORMAT_FILESYSTEMS = "android.permission.MOUNT_FORMAT_FILESYSTEMS";

    field public static final java.lang.String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS";

    field public static final java.lang.String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";

    field public static final java.lang.String NETWORK_SETUP_WIZARD = "android.permission.NETWORK_SETUP_WIZARD";

    field public static final java.lang.String NOTIFICATION_DURING_SETUP = "android.permission.NOTIFICATION_DURING_SETUP";

    field public static final java.lang.String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";

    field public static final java.lang.String OBSERVE_APP_USAGE = "android.permission.OBSERVE_APP_USAGE";
@@ -3074,6 +3075,7 @@ package android.net { 
  public class ConnectivityManager {

    method public java.lang.String getCaptivePortalServerUrl();

    method public boolean isTetheringSupported();

    method public void setAirplaneMode(boolean);

    method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);

    method public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback, android.os.Handler);

    method public void stopTethering(int);

config/hiddenapi-light-greylist.txt

+0 −1
Original line number Diff line number Diff line
@@ -573,7 +573,6 @@ Landroid/net/IConnectivityManager;->getTetherableWifiRegexs()[Ljava/lang/String; 
Landroid/net/IConnectivityManager;->getTetheredIfaces()[Ljava/lang/String;

Landroid/net/IConnectivityManager;->getTetheringErroredIfaces()[Ljava/lang/String;

Landroid/net/IConnectivityManager;->reportInetCondition(II)V

Landroid/net/IConnectivityManager;->setAirplaneMode(Z)V

Landroid/net/IConnectivityManager;->startLegacyVpn(Lcom/android/internal/net/VpnProfile;)V

Landroid/net/INetworkManagementEventObserver$Stub;-><init>()V

Landroid/net/INetworkPolicyListener$Stub;-><init>()V

core/java/android/net/ConnectivityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -2728,7 +2728,7 @@ public class ConnectivityManager { 
     * @hide

     */

    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)

    @UnsupportedAppUsage

    @SystemApi

    public void setAirplaneMode(boolean enable) {

        try {

            mService.setAirplaneMode(enable);

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1441,6 +1441,7 @@ 


    <!-- Allows SetupWizard to call methods in Networking services

         <p>Not for use by any other third-party or privileged applications.

         @SystemApi

         @hide This should only be used by SetupWizard.

    -->

    <permission android:name="android.permission.NETWORK_SETUP_WIZARD"