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

Commit 1bade5d6 authored by Christine Franks's avatar Christine Franks
Browse files

Add DISALLOW_CONFIG_LOCALE user restriction 

Bug: 67586452
Test: make cts && cts-tradefed run cts-dev -m DevicePolicyManager \
-t com.android.cts.devicepolicy.UserRestrictionsTest

Change-Id: Icaf78dec5527c57c00e2b9854ba17ec1982bfac4
parent aaad26df

api/current.txt

+2 −1
Original line number Diff line number Diff line
@@ -31971,6 +31971,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";
@@ -39943,8 +39944,8 @@ package android.telephony { 
    field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int";

    field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

    field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -34820,6 +34820,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";
@@ -43459,8 +43460,8 @@ package android.telephony { 
    field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int";

    field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

    field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";

api/test-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -32237,6 +32237,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";
@@ -40337,8 +40338,8 @@ package android.telephony { 
    field public static final java.lang.String KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT = "duration_blocking_disabled_after_emergency_int";

    field public static final java.lang.String KEY_EDITABLE_ENHANCED_4G_LTE_BOOL = "editable_enhanced_4g_lte_bool";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL = "editable_voicemail_number_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_EDITABLE_VOICEMAIL_NUMBER_SETTING_BOOL = "editable_voicemail_number_setting_bool";

    field public static final java.lang.String KEY_ENABLE_APPS_STRING_ARRAY = "enable_apps_string_array";

    field public static final java.lang.String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";

    field public static final java.lang.String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";

    field public static final java.lang.String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";

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,