Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e91c05 authored by Lenka Trochtova's avatar Lenka Trochtova Committed by Android (Google) Code Review
Browse files

Merge "Make UserManager#DISALLOW_OEM_UNLOCK a system API."

parents aa5f515b 12b04969

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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";

core/java/android/os/UserManager.java

+3 −0
Original line number Diff line number Diff line
@@ -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";



    /**