Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

2015-05-26 20:39:27 +00:00
parent cf3c8af6c5 298f98fa23
commit 5e0ef0d0e6
1 changed files with 2 additions and 1 deletions
--- 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