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

Commit aeb04599 authored by arangelov's avatar arangelov
Browse files

Add extra in DevicePolicyManager for provisioning trigger. 

We need this @SystemApi extra so that ManagedProvisioning can
know what triggered it.

Bug: 120496001
Test: None
Change-Id: I7f1e8ab53c877a6ecb56bf2601f3ef37e2779fb8
parent a46113a5

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -599,7 +599,12 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL";

    field public static final java.lang.String EXTRA_PROVISIONING_ORGANIZATION_NAME = "android.app.extra.PROVISIONING_ORGANIZATION_NAME";

    field public static final java.lang.String EXTRA_PROVISIONING_SUPPORT_URL = "android.app.extra.PROVISIONING_SUPPORT_URL";

    field public static final java.lang.String EXTRA_PROVISIONING_TRIGGER = "android.app.extra.PROVISIONING_TRIGGER";

    field public static final java.lang.String EXTRA_RESTRICTION = "android.app.extra.RESTRICTION";

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

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

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

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

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

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

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

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

+58 −0
Original line number Diff line number Diff line
@@ -1118,6 +1118,64 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_USE_MOBILE_DATA =

            "android.app.extra.PROVISIONING_USE_MOBILE_DATA";



    /**

     * A String extra holding the provisioning trigger. It could be one of

     * {@link #PROVISIONING_TRIGGER_CLOUD_ENROLLMENT}, {@link #PROVISIONING_TRIGGER_QR_CODE},

     * {@link #PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER} or {@link

     * #PROVISIONING_TRIGGER_UNSPECIFIED}.

     *

     * <p>Use in an intent with action {@link

     * #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}.

     * @hide

     */

    @SystemApi

    public static final String EXTRA_PROVISIONING_TRIGGER =

            "android.app.extra.PROVISIONING_TRIGGER";



    /**

     * A value for {@link #EXTRA_PROVISIONING_TRIGGER} indicating that the provisioning

     * trigger has not been specified.

     * @see #PROVISIONING_TRIGGER_CLOUD_ENROLLMENT

     * @see #PROVISIONING_TRIGGER_QR_CODE

     * @see #PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER

     * @hide

     */

    @SystemApi

    public static final int PROVISIONING_TRIGGER_UNSPECIFIED = 0;



    /**

     * A value for {@link #EXTRA_PROVISIONING_TRIGGER} indicating that the provisioning

     * trigger is cloud enrollment.

     * @see #PROVISIONING_TRIGGER_QR_CODE

     * @see #PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER

     * @see #PROVISIONING_TRIGGER_UNSPECIFIED

     * @hide

     */

    @SystemApi

    public static final int PROVISIONING_TRIGGER_CLOUD_ENROLLMENT = 1;



    /**

     * A value for {@link #EXTRA_PROVISIONING_TRIGGER} indicating that the provisioning

     * trigger is the QR code scanner.

     * @see #PROVISIONING_TRIGGER_CLOUD_ENROLLMENT

     * @see #PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER

     * @see #PROVISIONING_TRIGGER_UNSPECIFIED

     * @hide

     */

    @SystemApi

    public static final int PROVISIONING_TRIGGER_QR_CODE = 2;



    /**

     * A value for {@link #EXTRA_PROVISIONING_TRIGGER} indicating that the provisioning

     * trigger is persistent device owner enrollment.

     * @see #PROVISIONING_TRIGGER_CLOUD_ENROLLMENT

     * @see #PROVISIONING_TRIGGER_QR_CODE

     * @see #PROVISIONING_TRIGGER_UNSPECIFIED

     * @hide

     */

    @SystemApi

    public static final int PROVISIONING_TRIGGER_PERSISTENT_DEVICE_OWNER = 3;



    /**

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

     *