diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-05-26 20:39:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-26 20:39:28 +0000 |
| commit | 5e0ef0d0e62b77bcfc687bfbc1db875db71eba69 (patch) | |
| tree | 11df943849d2c4758d45f8e559b504d6aded872b | |
| parent | cf3c8af6c5dbdd7c0c7c019fe10ca21c9c2369cc (diff) | |
| parent | 298f98fa234f353267ddc9c75d58e8cc542c25f1 (diff) | |
| download | frameworks_base-5e0ef0d0e62b77bcfc687bfbc1db875db71eba69.zip frameworks_base-5e0ef0d0e62b77bcfc687bfbc1db875db71eba69.tar.gz frameworks_base-5e0ef0d0e62b77bcfc687bfbc1db875db71eba69.tar.bz2 | |
Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev
| -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 |