diff options
| author | 2017-07-28 17:11:28 +0000 | |
|---|---|---|
| committer | 2017-07-28 17:11:28 +0000 | |
| commit | 91f16ace4f3121a34b038dd453386b9d4daf826a (patch) | |
| tree | d91f7e603d6112a471af1fa1f5f230e5d93d852a | |
| parent | adb8c522a84b5c7531b009b7a8d4c854ca7dee08 (diff) | |
| parent | 05fef7ed69af434dc43c700a751140ecbbfd069d (diff) | |
Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev
| -rw-r--r-- | core/java/android/os/UserManager.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 79a67fe11554..de0d5d76aec2 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -303,10 +303,12 @@ public class UserManager { public static final String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features"; /** - * Specifies if a user is disallowed from configuring VPN. - * The default value is <code>false</code>. - * This restriction has an effect in a managed profile only from - * {@link android.os.Build.VERSION_CODES#M} + * Specifies if a user is disallowed from configuring a VPN. The default value is + * <code>false</code>. This restriction has an effect when set by device owners and, in Android + * 6.0 ({@linkplain android.os.Build.VERSION_CODES#M API level 23}) or higher, profile owners. + * <p>This restriction also prevents VPNs from starting. However, in Android 7.0 + * ({@linkplain android.os.Build.VERSION_CODES#N API level 24}) or higher, the system does + * start always-on VPNs created by the device or profile owner. * * <p>Key for user restrictions. * <p>Type: Boolean |