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

Commit dea471ef authored by Mahaver Chopra's avatar Mahaver Chopra
Browse files

Added Data roaming user restriction 

Added new user restriction DISALLOW_DATA_ROAMING, can only be set
by device owners.

Bug: 24890464
Change-Id: Ic4cb37dd5f9bbffa35f921751488ef7c7ff99452
parent 66d298ca

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28415,6 +28415,7 @@ package android.os { 
    field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";

    field public static final java.lang.String DISALLOW_CREATE_WINDOWS = "no_create_windows";

    field public static final java.lang.String DISALLOW_CROSS_PROFILE_COPY_PASTE = "no_cross_profile_copy_paste";

    field public static final java.lang.String DISALLOW_DATA_ROAMING = "no_data_roaming";

    field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";

    field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset";

    field public static final java.lang.String DISALLOW_FUN = "no_fun";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -30418,6 +30418,7 @@ package android.os { 
    field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";

    field public static final java.lang.String DISALLOW_CREATE_WINDOWS = "no_create_windows";

    field public static final java.lang.String DISALLOW_CROSS_PROFILE_COPY_PASTE = "no_cross_profile_copy_paste";

    field public static final java.lang.String DISALLOW_DATA_ROAMING = "no_data_roaming";

    field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";

    field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset";

    field public static final java.lang.String DISALLOW_FUN = "no_fun";

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28424,6 +28424,7 @@ package android.os { 
    field public static final java.lang.String DISALLOW_CONFIG_WIFI = "no_config_wifi";

    field public static final java.lang.String DISALLOW_CREATE_WINDOWS = "no_create_windows";

    field public static final java.lang.String DISALLOW_CROSS_PROFILE_COPY_PASTE = "no_cross_profile_copy_paste";

    field public static final java.lang.String DISALLOW_DATA_ROAMING = "no_data_roaming";

    field public static final java.lang.String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";

    field public static final java.lang.String DISALLOW_FACTORY_RESET = "no_factory_reset";

    field public static final java.lang.String DISALLOW_FUN = "no_fun";

core/java/android/os/UserManager.java

+10 −0
Original line number Diff line number Diff line
@@ -517,6 +517,16 @@ public class UserManager { 
     */

    public static final String DISALLOW_CAMERA = "no_camera";



    /**

     * Specifies if a user is not allowed to use cellular data when roaming. This can only be set by

     * device owners. The default value is <code>false</code>.

     *

     * @see DevicePolicyManager#addUserRestriction(ComponentName, String)

     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_DATA_ROAMING = "no_data_roaming";



    /**

     * Allows apps in the parent profile to handle web links from the managed profile.

     *

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+5 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,11 @@ public class SettingsProvider extends ContentProvider { 
                break;



            default:

                if (setting.startsWith(Settings.Global.DATA_ROAMING)) {

                    if ("0".equals(value)) return false;

                    restriction = UserManager.DISALLOW_DATA_ROAMING;

                    break;

                }

                return false;

        }