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

Commit 9c74d734 authored by Antoan Angelov's avatar Antoan Angelov Committed by Android (Google) Code Review
Browse files

Merge "Add provisioning extra to keep screen on"

parents 08d0c476 d2958fd8

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -7565,6 +7565,7 @@ package android.app.admin { 
    field @Deprecated public static final String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";

    field public static final String EXTRA_PROVISIONING_IMEI = "android.app.extra.PROVISIONING_IMEI";

    field public static final String EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION = "android.app.extra.PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION";

    field public static final String EXTRA_PROVISIONING_KEEP_SCREEN_ON = "android.app.extra.PROVISIONING_KEEP_SCREEN_ON";

    field public static final String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";

    field public static final String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

    field public static final String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";

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

+14 −0
Original line number Diff line number Diff line
@@ -2884,6 +2884,20 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_RETURN_BEFORE_POLICY_COMPLIANCE =

            "android.app.extra.PROVISIONING_RETURN_BEFORE_POLICY_COMPLIANCE";













    /**













     * A {@code boolean} flag that indicates whether the screen should be on throughout the













     * provisioning flow.













     *













     * <p>The default value is {@code false}.













     *













     * <p>This extra can either be passed as an extra to the {@link













     * #ACTION_PROVISION_MANAGED_PROFILE} intent, or it can be returned by the













     * admin app when performing the admin-integrated provisioning flow as a result of the













     * {@link #ACTION_GET_PROVISIONING_MODE} activity.













     */













    public static final String EXTRA_PROVISIONING_KEEP_SCREEN_ON =













            "android.app.extra.PROVISIONING_KEEP_SCREEN_ON";



























    /**















     * Activity action: Starts the administrator to show policy compliance for the provisioning.















     * This action is used any time that the administrator has an opportunity to show policy