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

Commit 30b90101 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add NETWORK_AIRPLANE_MODE permission"

parents c4a819f5 affb2296

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ package android { 
    field public static final String MODIFY_PARENTAL_CONTROLS = "android.permission.MODIFY_PARENTAL_CONTROLS";

    field public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE";

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

    field public static final String NETWORK_AIRPLANE_MODE = "android.permission.NETWORK_AIRPLANE_MODE";

    field public static final String NETWORK_CARRIER_PROVISIONING = "android.permission.NETWORK_CARRIER_PROVISIONING";

    field public static final String NETWORK_FACTORY = "android.permission.NETWORK_FACTORY";

    field public static final String NETWORK_MANAGED_PROVISIONING = "android.permission.NETWORK_MANAGED_PROVISIONING";
@@ -4601,7 +4602,7 @@ package android.net { 
    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void getLatestTetheringEntitlementResult(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEntitlementResultListener);

    method @RequiresPermission(anyOf={android.Manifest.permission.TETHER_PRIVILEGED, android.Manifest.permission.WRITE_SETTINGS}) public boolean isTetheringSupported();

    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void registerTetheringEventCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEventCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void setAirplaneMode(boolean);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_AIRPLANE_MODE, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void setAirplaneMode(boolean);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public boolean shouldAvoidBadWifi();

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle);

    method @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);

core/java/android/net/ConnectivityManager.java

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

     */

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_AIRPLANE_MODE,

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK})

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -1623,6 +1623,12 @@ 
    <permission android:name="android.permission.REQUEST_NETWORK_SCORES"

        android:protectionLevel="signature|setup" />



    <!-- @SystemApi @hide Allows applications to toggle airplane mode.

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

    -->

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

        android:protectionLevel="signature" />



    <!-- Allows network stack services (Connectivity and Wifi) to coordinate

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

         @SystemApi

services/core/java/com/android/server/ConnectivityService.java

+10 −1
Original line number Diff line number Diff line
@@ -2023,6 +2023,15 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);

    }



    private void enforceAirplaneModePermission() {

        enforceAnyPermissionOf(

                android.Manifest.permission.NETWORK_AIRPLANE_MODE,

                android.Manifest.permission.NETWORK_SETTINGS,

                android.Manifest.permission.NETWORK_SETUP_WIZARD,

                android.Manifest.permission.NETWORK_STACK,

                NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK);

    }



    private boolean checkNetworkStackPermission() {

        return checkAnyPermissionOf(

                android.Manifest.permission.NETWORK_STACK,
@@ -4734,7 +4743,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    @Override

    public void setAirplaneMode(boolean enable) {

        enforceNetworkStackSettingsOrSetup();

        enforceAirplaneModePermission();

        final long ident = Binder.clearCallingIdentity();

        try {

            final ContentResolver cr = mContext.getContentResolver();