summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChristine Franks <christyfranks@google.com>2017-11-09 16:02:46 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-11-09 16:02:46 +0000
commitfde6ea8d29da5f9c6b321df64c8f0722d1173586 (patch)
treee8151f2e3cfed9f3cf89b7b6e2413cb35d0084fc /core/java/android
parenta3e562cd8f0abdeabe05942400dae9e0d8a4e308 (diff)
parent1bade5d62974544639f2b1656a7e2785b0338a6f (diff)
Merge "Add DISALLOW_CONFIG_LOCALE user restriction"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/UserManager.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java
index 28836e4ae6cd..de527364a990 100644
--- a/core/java/android/os/UserManager.java
+++ b/core/java/android/os/UserManager.java
@@ -140,6 +140,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>.
*