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

Commit fbabc7f5 authored by Nicolas Prévot's avatar Nicolas Prévot Committed by Android (Google) Code Review
Browse files

Merge "Add extra in DevicePolicyManager to colorize the provisioning."

parents 71c84e51 caf11cdc

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5869,6 +5869,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

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

    field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";

    field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6003,6 +6003,7 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";

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

    field public static final java.lang.String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";

    field public static final java.lang.String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    field public static final java.lang.String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

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

+17 −1
Original line number Diff line number Diff line
@@ -131,7 +131,12 @@ public class DevicePolicyManager { 
     * As of {@link android.os.Build.VERSION_CODES#M}, it should contain the extra

     * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME} instead, although specifying only

     * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME} is still supported.

     * This intent may also contain the extra {@link #EXTRA_PROVISIONING_LOGO_URI}.

     *

     * <p> The intent may also contain the following extras:

     * <ul>

     * <li> {@link #EXTRA_PROVISIONING_LOGO_URI}, optional </li>

     * <li> {@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional </li>

     * </ul>

     *

     * <p> When managed provisioning has completed, broadcasts are sent to the application specified

     * in the provisioning intent. The
@@ -199,6 +204,7 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li>

     * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li>

     * </ul>

     *

     * <p> When device owner provisioning has completed, an intent of the type
@@ -357,6 +363,16 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_EMAIL_ADDRESS

        = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";



    /**

     * A integer extra indicating indicating the predominant color to show during the provisioning.

     * Refer to {@link android.graphics#Color} for how the color is represented.

     *

     * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE} or

     * {@link #ACTION_PROVISION_MANAGED_DEVICE}.

     */

    public static final String EXTRA_PROVISIONING_MAIN_COLOR =

             "android.app.extra.PROVISIONING_MAIN_COLOR";



    /**

     * A Boolean extra that can be used by the mobile device management application to skip the

     * disabling of system apps during provisioning when set to {@code true}.