diff options
| author | Benjamin Miller <benjaminmiller@google.com> | 2017-07-24 10:11:39 +0200 |
|---|---|---|
| committer | Benjamin Miller <benjaminmiller@google.com> | 2017-07-28 09:56:24 +0000 |
| commit | 05fef7ed69af434dc43c700a751140ecbbfd069d (patch) | |
| tree | aaf84ac0acd43325359fde967cf6cf263223f63b /core/java/android/os/UserManager.java | |
| parent | 784b56e1e64049d3bf81b7d8fa8c1ae3408c5886 (diff) | |
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
(cherry picked from commit 1f83e4d498f4a4f2c8796cdefe330a4caf258424)
Diffstat (limited to 'core/java/android/os/UserManager.java')
| -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 |