diff options
| author | Julia Reynolds <juliacr@google.com> | 2014-06-18 18:34:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-17 21:03:08 +0000 |
| commit | 779d2cffbce3946f6397f2b44a060c9775a2991b (patch) | |
| tree | 1f94db64c6a305b00ab26a1bf0341c86118d33f4 /core/java/android/os | |
| parent | b576cec2626d469868f0908b7926790ea5b91493 (diff) | |
| parent | 36fbc8d6453da438a8ab83352ff1bcfcba5f25b5 (diff) | |
| download | frameworks_base-779d2cffbce3946f6397f2b44a060c9775a2991b.zip frameworks_base-779d2cffbce3946f6397f2b44a060c9775a2991b.tar.gz frameworks_base-779d2cffbce3946f6397f2b44a060c9775a2991b.tar.bz2 | |
Merge "Rename apps User Restriction."
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/UserManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 468cfe0..757f38e 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -226,14 +226,14 @@ public class UserManager { public static final String DISALLOW_CONFIG_MOBILE_NETWORKS = "no_config_mobile_networks"; /** - * Key for user restrictions. Specifies if a user is disallowed from configuring + * Key for user restrictions. Specifies if a user is disallowed from controlling * applications in Settings. The default value is <code>false</code>. * <p> * Type: Boolean * @see #setUserRestrictions(Bundle) * @see #getUserRestrictions() */ - public static final String DISALLOW_CONFIG_APPS = "no_config_apps"; + public static final String DISALLOW_APPS_CONTROL = "no_control_apps"; /** * Key for user restrictions. Specifies if a user is disallowed from mounting |