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

Merge "Docs: Note that DISALLOW_CONFIG_VPN stops VPNs from starting" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-28 17:11:28 +00:00
committed by Android (Google) Code Review
parent adb8c522a8 05fef7ed69
commit 91f16ace4f
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,10 +303,12 @@ public class UserManager {
public static final String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features"; public static final String DISALLOW_DEBUGGING_FEATURES = "no_debugging_features";
/** /**
* Specifies if a user is disallowed from configuring VPN. * Specifies if a user is disallowed from configuring a VPN. The default value is
* The default value is <code>false</code>. * <code>false</code>. This restriction has an effect when set by device owners and, in Android
* This restriction has an effect in a managed profile only from * 6.0 ({@linkplain android.os.Build.VERSION_CODES#M API level 23}) or higher, profile owners.
* {@link android.os.Build.VERSION_CODES#M} * <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>Key for user restrictions.
* <p>Type: Boolean * <p>Type: Boolean