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

Commit fde6ea8d authored by Christine Franks's avatar Christine Franks Committed by Android (Google) Code Review
Browse files

Merge "Add DISALLOW_CONFIG_LOCALE user restriction"

parents a3e562cd 1bade5d6

api/current.txt

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

    field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

    field public static final java.lang.String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time";

    field public static final java.lang.String DISALLOW_CONFIG_LOCALE = "no_config_locale";

    field public static final java.lang.String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks";

    field public static final java.lang.String DISALLOW_CONFIG_TETHERING = "no_config_tethering";

    field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn";

api/system-current.txt

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

    field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

    field public static final java.lang.String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time";

    field public static final java.lang.String DISALLOW_CONFIG_LOCALE = "no_config_locale";

    field public static final java.lang.String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks";

    field public static final java.lang.String DISALLOW_CONFIG_TETHERING = "no_config_tethering";

    field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn";

api/test-current.txt

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

    field public static final java.lang.String DISALLOW_CONFIG_CREDENTIALS = "no_config_credentials";

    field public static final java.lang.String DISALLOW_CONFIG_DATE_TIME = "no_config_date_time";

    field public static final java.lang.String DISALLOW_CONFIG_LOCALE = "no_config_locale";

    field public static final java.lang.String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks";

    field public static final java.lang.String DISALLOW_CONFIG_TETHERING = "no_config_tethering";

    field public static final java.lang.String DISALLOW_CONFIG_VPN = "no_config_vpn";

core/java/android/os/UserManager.java

+12 −0
Original line number Diff line number Diff line
@@ -139,6 +139,18 @@ public class UserManager { 
     */

    public static final String DISALLOW_CONFIG_WIFI = "no_config_wifi";



    /**

     * Specifies if a user is disallowed from changing the device

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

     *

     * <p>Key for user restrictions.

     * <p>Type: Boolean

     * @see DevicePolicyManager#addUserRestriction(ComponentName, String)

     * @see DevicePolicyManager#clearUserRestriction(ComponentName, String)

     * @see #getUserRestrictions()

     */

    public static final String DISALLOW_CONFIG_LOCALE = "no_config_locale";



    /**

     * Specifies if a user is disallowed from installing applications.

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

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

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ public class UserRestrictionsUtils { 


    public static final Set<String> USER_RESTRICTIONS = newSetWithUniqueCheck(new String[] {

            UserManager.DISALLOW_CONFIG_WIFI,

            UserManager.DISALLOW_CONFIG_LOCALE,

            UserManager.DISALLOW_MODIFY_ACCOUNTS,

            UserManager.DISALLOW_INSTALL_APPS,

            UserManager.DISALLOW_UNINSTALL_APPS,