Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5e0ef0d0: Merge "Say in the doc that DISALLOW_CONFIG_VPN now works." into mnc-dev

Browse Source 
* commit '5e0ef0d0e62b77bcfc687bfbc1db875db71eba69':
  Say in the doc that DISALLOW_CONFIG_VPN now works.
This commit is contained in:
Nicolas Prevot
2015-05-26 20:51:38 +00:00
committed by Android Git Automerger
parent f0d37251a7 5e0ef0d0e6
commit a4aab96e20
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/os/UserManager.java
View File

@@ -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