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

Commit 2c3c66a2 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

Merge "Introduce Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN" into mnc-dev

parents 02ebcdb9 4045d249

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26585,6 +26585,7 @@ package android.provider { 
    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";

    field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";

    field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";

    field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown";

    field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";

    field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";

    field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28633,6 +28633,7 @@ package android.provider { 
    field public static final java.lang.String USB_MASS_STORAGE_ENABLED = "usb_mass_storage_enabled";

    field public static final java.lang.String USE_GOOGLE_MAIL = "use_google_mail";

    field public static final java.lang.String WAIT_FOR_DEBUGGER = "wait_for_debugger";

    field public static final java.lang.String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN = "wifi_device_owner_configs_lockdown";

    field public static final java.lang.String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";

    field public static final java.lang.String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS = "wifi_mobile_data_transition_wakelock_timeout_ms";

    field public static final java.lang.String WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON = "wifi_networks_available_notification_on";

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

+1 −0
Original line number Diff line number Diff line
@@ -3972,6 +3972,7 @@ public class DevicePolicyManager { 
     * <li>{@link Settings.Global#STAY_ON_WHILE_PLUGGED_IN}

     * This setting is only available from {@link android.os.Build.VERSION_CODES#MNC} onwards

     * and can only be set if {@link #setMaximumTimeToLock} is not used to set a timeout.</li>

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

     * </ul>

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

core/java/android/provider/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -6684,6 +6684,17 @@ public final class Settings { 
       public static final String WIFI_MOBILE_DATA_TRANSITION_WAKELOCK_TIMEOUT_MS =

           "wifi_mobile_data_transition_wakelock_timeout_ms";



       /**

        * This setting controls whether WiFi configurations created by a Device Owner app

        * should be locked down (that is, be editable or removable only by the Device Owner App,

        * not even by Settings app).

        * This setting takes integer values. Non-zero values mean DO created configurations

        * are locked down. Value of zero means they are not. Default value in the absence of

        * actual value to this setting is 0.

        */

       public static final String WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN =

               "wifi_device_owner_configs_lockdown";



       /**

        * The operational wifi frequency band

        * Set to one of {@link WifiManager#WIFI_FREQUENCY_BAND_AUTO},

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

+1 −0
Original line number Diff line number Diff line
@@ -246,6 +246,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.USB_MASS_STORAGE_ENABLED);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.WIFI_SLEEP_POLICY);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.STAY_ON_WHILE_PLUGGED_IN);

        GLOBAL_SETTINGS_WHITELIST.add(Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN);

    }



    // Keyguard features that when set of a profile will affect the profiles