From 1f83e4d498f4a4f2c8796cdefe330a4caf258424 Mon Sep 17 00:00:00 2001 From: Benjamin Miller Date: Mon, 24 Jul 2017 10:11:39 +0200 Subject: [PATCH] Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting VPNs don't start except a DPC's configured always-on VPN. Clarified version behaviors. Staged at: go/dac-stage/reference/android/os/UserManager.html#DISALLOW_CONFIG_VPN Test: make ds-docs and output staged UserManager page Bug: 63582789 Change-Id: I83c0c6cc580b9d1d224a94e073f559f23cf4d672 --- core/java/android/os/UserManager.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 3337def4c4e1b..dba9e844b7440 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 false. - * 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 + * false. 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. + *

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. * *

Key for user restrictions. *

Type: Boolean