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

Commit abc03c7a authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android (Google) Code Review
Browse files

Merge "Fail silently when changing BLUETOOTH_ON/WIFI_ON directly"

parents 6cdb27e7 41916d49

core/java/android/app/admin/DevicePolicyManager.java

+7 −2
Original line number Diff line number Diff line
@@ -3363,13 +3363,18 @@ public class DevicePolicyManager { 
     * <li>{@link Settings.Global#ADB_ENABLED}</li>

     * <li>{@link Settings.Global#AUTO_TIME}</li>

     * <li>{@link Settings.Global#AUTO_TIME_ZONE}</li>

     * <li>{@link Settings.Global#BLUETOOTH_ON}</li>

     * <li>{@link Settings.Global#BLUETOOTH_ON}

     * Changing this setting has not effect as of {@link android.os.Build.VERSION_CODES#MNC}. Use

     * {@link android.bluetooth.BluetoothAdapter#enable()} and

     * {@link android.bluetooth.BluetoothAdapter#disable()} instead.</li>

     * <li>{@link Settings.Global#DATA_ROAMING}</li>

     * <li>{@link Settings.Global#DEVELOPMENT_SETTINGS_ENABLED}</li>

     * <li>{@link Settings.Global#MODE_RINGER}</li>

     * <li>{@link Settings.Global#NETWORK_PREFERENCE}</li>

     * <li>{@link Settings.Global#USB_MASS_STORAGE_ENABLED}</li>

     * <li>{@link Settings.Global#WIFI_ON}</li>

     * <li>{@link Settings.Global#WIFI_ON}

     * Changing this setting has not effect as of {@link android.os.Build.VERSION_CODES#MNC}. Use

     * {@link android.net.wifi.WifiManager#setWifiEnabled(boolean)} instead.</li>

     * <li>{@link Settings.Global#WIFI_SLEEP_POLICY}</li>

     * </ul>

     *

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+7 −4
Original line number Diff line number Diff line
@@ -196,13 +196,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.ADB_ENABLED);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.AUTO_TIME);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.AUTO_TIME_ZONE);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.BLUETOOTH_ON);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.DATA_ROAMING);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.DEVELOPMENT_SETTINGS_ENABLED);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.MODE_RINGER);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.NETWORK_PREFERENCE);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.USB_MASS_STORAGE_ENABLED);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.WIFI_ON);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.WIFI_SLEEP_POLICY);

    }
@@ -5269,9 +5267,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);



            if (!GLOBAL_SETTINGS_WHITELIST.contains(setting)) {

                // BLUETOOTH_ON and WIFI_ON used to be supported but not any more. We do not want to

                // throw a SecurityException not to break apps.

                if (!Settings.Global.BLUETOOTH_ON.equals(setting)

                        && !Settings.Global.WIFI_ON.equals(setting)) {

                    throw new SecurityException(String.format(

                            "Permission denial: device owners cannot update %1$s", setting));

                }

            }



            long id = Binder.clearCallingIdentity();

            try {