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

Merge "Make UserManager#DISALLOW_OEM_UNLOCK a system API."

Browse Source
This commit is contained in:
Lenka Trochtova
2016-12-13 17:04:58 +00:00
committed by Android (Google) Code Review
parent aa5f515b1a 12b0496944
commit 35e91c055a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -32395,6 +32395,7 @@ package android.os {
field public static final java.lang.String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
field public static final java.lang.String DISALLOW_MOUNT_PHYSICAL_MEDIA = "no_physical_media";
field public static final java.lang.String DISALLOW_NETWORK_RESET = "no_network_reset";
field public static final java.lang.String DISALLOW_OEM_UNLOCK = "no_oem_unlock";
field public static final java.lang.String DISALLOW_OUTGOING_BEAM = "no_outgoing_beam";
field public static final java.lang.String DISALLOW_OUTGOING_CALLS = "no_outgoing_calls";
field public static final java.lang.String DISALLOW_REMOVE_USER = "no_remove_user";

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

@@ -634,11 +634,14 @@ public class UserManager {
* <code>false</code>. Setting this restriction has no effect if the bootloader is already
* unlocked.
*
* <p>Not for use by third-party applications.
*
* @see DevicePolicyManager#addUserRestriction(ComponentName, String)
* @see DevicePolicyManager#clearUserRestriction(ComponentName, String)
* @see #getUserRestrictions()
* @hide
*/
@SystemApi
public static final String DISALLOW_OEM_UNLOCK = "no_oem_unlock";
/**