diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-05-26 20:51:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-26 20:51:38 +0000 |
| commit | a4aab96e2099a47a76cd8b684d06838a8d744c3e (patch) | |
| tree | 7eabc7a216c9647af8bcb88b8187065b8aa5b745 | |
| parent | f0d37251a78bda74a50d09fb0ce8006e3d687a44 (diff) | |
| parent | 5e0ef0d0e62b77bcfc687bfbc1db875db71eba69 (diff) | |
| download | frameworks_base-a4aab96e2099a47a76cd8b684d06838a8d744c3e.zip frameworks_base-a4aab96e2099a47a76cd8b684d06838a8d744c3e.tar.gz frameworks_base-a4aab96e2099a47a76cd8b684d06838a8d744c3e.tar.bz2 | |
am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
* commit '5e0ef0d0e62b77bcfc687bfbc1db875db71eba69':
Say in the doc that DISALLOW_CONFIG_VPN now works.
| -rw-r--r-- | core/java/android/os/UserManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 11043b3..a81b83f 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -177,7 +177,8 @@ public class UserManager { /** * Specifies if a user is disallowed from configuring VPN. * The default value is <code>false</code>. - * This restriction has no effect in a managed profile. + * This restriction has an effect in a managed profile only from + * {@link android.os.Build.VERSION_CODES#MNC} * * <p/>Key for user restrictions. * <p/>Type: Boolean |