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 
am: 91f16ace4f

Change-Id: Id7d2c62577e0b534a7dd6605f722e7c5639e46b7
This commit is contained in:
Benjamin Miller
2017-07-28 17:30:18 +00:00
committed by android-build-merger
parent 6683cc6a83 91f16ace4f
commit 5934ae605a
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";
/**
* 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