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

Commit 3889ff53 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Gerrit Code Review
Browse files

Merge "Change permissions checks for setAirplaneMode."

parents 9d7e1fe7 f5845d14

core/java/android/net/ConnectivityManager.java

+4 −1
Original line number Diff line number Diff line
@@ -2731,7 +2731,10 @@ public class ConnectivityManager { 
     *

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL)

    @RequiresPermission(anyOf = {

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK})

    @SystemApi

    public void setAirplaneMode(boolean enable) {

        try {

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

+18 −1
Original line number Diff line number Diff line
@@ -1679,6 +1679,16 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                "ConnectivityService");

    }



    private void enforceAnyPermissionOf(String... permissions) {

        for (String permission : permissions) {

            if (mContext.checkCallingOrSelfPermission(permission) == PERMISSION_GRANTED) {

                return;

            }

        }

        throw new SecurityException(

            "Requires one of the following permissions: " + String.join(", ", permissions) + ".");

    }



    private void enforceInternetPermission() {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.INTERNET,
@@ -1723,6 +1733,13 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                "ConnectivityService");

    }



    private void enforceNetworkStackSettingsOrSetup() {

        enforceAnyPermissionOf(

            android.Manifest.permission.NETWORK_SETTINGS,

            android.Manifest.permission.NETWORK_SETUP_WIZARD,

            android.Manifest.permission.NETWORK_STACK);

    }



    private boolean checkNetworkStackPermission() {

        return PERMISSION_GRANTED == mContext.checkCallingOrSelfPermission(

                android.Manifest.permission.NETWORK_STACK);
@@ -3984,7 +4001,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    @Override

    public void setAirplaneMode(boolean enable) {

        enforceConnectivityInternalPermission();

        enforceNetworkStackSettingsOrSetup();

        final long ident = Binder.clearCallingIdentity();

        try {

            final ContentResolver cr = mContext.getContentResolver();