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

Commit 30194853 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add SUPPORTED_MODES_DEVICE_OWNER to force DO provisioning"

parents f0243ed0 b57474fe

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -906,6 +906,7 @@ package android.app.admin { 
    field public static final int STATE_USER_SETUP_FINALIZED = 3; // 0x3

    field public static final int STATE_USER_SETUP_INCOMPLETE = 1; // 0x1

    field public static final int STATE_USER_UNMANAGED = 0; // 0x0

    field public static final int SUPPORTED_MODES_DEVICE_OWNER = 4; // 0x4

    field public static final int SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED = 3; // 0x3

    field public static final int SUPPORTED_MODES_ORGANIZATION_OWNED = 1; // 0x1

    field public static final int SUPPORTED_MODES_PERSONALLY_OWNED = 2; // 0x2

core/java/android/app/admin/DevicePolicyManager.java

+12 −1
Original line number Diff line number Diff line
@@ -1257,7 +1257,8 @@ public class DevicePolicyManager { 
    @IntDef(prefix = { "SUPPORTED_MODES_" }, value = {

            SUPPORTED_MODES_ORGANIZATION_OWNED,

            SUPPORTED_MODES_PERSONALLY_OWNED,

            SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED

            SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED,

            SUPPORTED_MODES_DEVICE_OWNER

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ProvisioningConfiguration {}
@@ -1383,6 +1384,15 @@ public class DevicePolicyManager { 
    @SystemApi

    public static final int SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED = 3;













    /**













     * A value for {@link #EXTRA_PROVISIONING_SUPPORTED_MODES} indicating that the only supported













     * provisioning mode is device owner.













     *













     * @hide













     */













    @SystemApi













    public static final int SUPPORTED_MODES_DEVICE_OWNER = 4;



























    /**















     * This MIME type is used for starting the device owner provisioning.















     *










@@ -2519,6 +2529,7 @@ public class DevicePolicyManager {













     * @see #SUPPORTED_MODES_ORGANIZATION_OWNED















     * @see #SUPPORTED_MODES_PERSONALLY_OWNED















     * @see #SUPPORTED_MODES_ORGANIZATION_AND_PERSONALLY_OWNED













     * @see #SUPPORTED_MODES_DEVICE_OWNER















     * @hide















     */















    @SystemApi