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

Commit a247dae4 authored by Gil Cukierman's avatar Gil Cukierman
Browse files

Add DISALLOW_CELLULAR_2G As a New User Restriction 

Bug: 247121216
Test: atest UserRestrictionsTest
Change-Id: I9be85ae7a9bfb3f287ea972bbaac35469e8d772b
parent 4ee969e8

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -32238,6 +32238,7 @@ package android.os { 
    field public static final String DISALLOW_BLUETOOTH = "no_bluetooth";

    field public static final String DISALLOW_BLUETOOTH_SHARING = "no_bluetooth_sharing";

    field public static final String DISALLOW_CAMERA_TOGGLE = "disallow_camera_toggle";

    field public static final String DISALLOW_CELLULAR_2G = "no_cellular_2g";

    field public static final String DISALLOW_CHANGE_WIFI_STATE = "no_change_wifi_state";

    field public static final String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";

    field public static final String DISALLOW_CONFIG_BRIGHTNESS = "no_config_brightness";

core/java/android/os/UserManager.java

+17 −0
Original line number Diff line number Diff line
@@ -1484,6 +1484,22 @@ public class UserManager { 
     */

    public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";



    /**

     * Specifies if a user is not allowed to use 2g networks.

     *

     * <p>This restriction can only be set by a device owner or a profile owner of an

     * organization-owned managed profile on the parent profile.

     * In all cases, the setting applies globally on the device and will prevent the device from

     * scanning for or connecting to 2g networks, except in the case of an emergency.

     *

     * <p>The default value is <code>false</code>.

     *

     * @see DevicePolicyManager#addUserRestriction(ComponentName, String)

     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_CELLULAR_2G = "no_cellular_2g";



    /**

     * List of key values that can be passed into the various user restriction related methods

     * in {@link UserManager} & {@link DevicePolicyManager}.
@@ -1565,6 +1581,7 @@ public class UserManager { 
            DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,

            DISALLOW_WIFI_DIRECT,

            DISALLOW_ADD_WIFI_CONFIG,

            DISALLOW_CELLULAR_2G,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface UserRestrictionKey {}

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+6 −3
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_WIFI_TETHERING,

            UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,

            UserManager.DISALLOW_WIFI_DIRECT,

            UserManager.DISALLOW_ADD_WIFI_CONFIG

            UserManager.DISALLOW_ADD_WIFI_CONFIG,

            UserManager.DISALLOW_CELLULAR_2G

    });



    public static final Set<String> DEPRECATED_USER_RESTRICTIONS = Sets.newArraySet(
@@ -195,7 +196,8 @@ public class UserRestrictionsUtils { 
            UserManager.DISALLOW_CHANGE_WIFI_STATE,

            UserManager.DISALLOW_WIFI_TETHERING,

            UserManager.DISALLOW_WIFI_DIRECT,

            UserManager.DISALLOW_ADD_WIFI_CONFIG

            UserManager.DISALLOW_ADD_WIFI_CONFIG,

            UserManager.DISALLOW_CELLULAR_2G

    );



    /**
@@ -234,7 +236,8 @@ public class UserRestrictionsUtils { 
                    UserManager.DISALLOW_CHANGE_WIFI_STATE,

                    UserManager.DISALLOW_WIFI_TETHERING,

                    UserManager.DISALLOW_WIFI_DIRECT,

                    UserManager.DISALLOW_ADD_WIFI_CONFIG

                    UserManager.DISALLOW_ADD_WIFI_CONFIG,

                    UserManager.DISALLOW_CELLULAR_2G

    );



    /**