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

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

Merge "Deprecate EXTRA_PROVISIONING_MAIN_COLOR" into sc-dev

parents a4734632 c09218d1

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7246,7 +7246,7 @@ package android.app.admin { 
    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";

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

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

    field @Deprecated public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";

    field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE";

    field public static final String EXTRA_PROVISIONING_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_PERMISSION_GRANT_OPT_OUT";

    field public static final String EXTRA_PROVISIONING_SERIAL_NUMBER = "android.app.extra.PROVISIONING_SERIAL_NUMBER";

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

+3 −3
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ public class DevicePolicyManager { 
     * {@link android.os.Build.VERSION_CODES#N}</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>

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

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

     * <li>{@link #EXTRA_PROVISIONING_DISCLAIMERS}, optional</li>
@@ -250,7 +249,6 @@ public class DevicePolicyManager { 
     * <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}, 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>If provisioning fails, the device returns to its previous state.
@@ -289,7 +287,6 @@ 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>

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

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

     * </ul>
@@ -654,7 +651,10 @@ public class DevicePolicyManager { 
     *

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

     * {@link #ACTION_PROVISION_MANAGED_DEVICE}.

     *

     * @deprecated Color customization is no longer supported in the provisioning flow.

     */

    @Deprecated

    public static final String EXTRA_PROVISIONING_MAIN_COLOR =

             "android.app.extra.PROVISIONING_MAIN_COLOR";