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

Commit 86989285 authored by Shreya Singh's avatar Shreya Singh Committed by Android (Google) Code Review
Browse files

Merge "Deprecating provisioning param- EXTRA_PROVISIONING_KEEP_SCREEN_ON. From... 

Merge "Deprecating provisioning param- EXTRA_PROVISIONING_KEEP_SCREEN_ON. From now on always keep the screen on throughout the provisioning flow."
parents 14118a3f 9a887db4

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7807,7 +7807,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 @Deprecated 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

+5 −2
Original line number Diff line number Diff line
@@ -3314,13 +3314,16 @@ public class DevicePolicyManager { 
     * 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.

     *

     * @deprecated from {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE}, the flag wouldn't

     * be functional. The screen is kept on throughout the provisioning flow.

     */













    @Deprecated















    public static final String EXTRA_PROVISIONING_KEEP_SCREEN_ON =















            "android.app.extra.PROVISIONING_KEEP_SCREEN_ON";