Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev (5e0ef0d0) · Commits · e / os / android_frameworks_base

core/java/android/os/UserManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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