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

Commit 1bf00cb6 authored by Aleks Todorov's avatar Aleks Todorov Committed by Android (Google) Code Review
Browse files

Merge "Deprecate `android.app.extra.PROVISIONING_LOGO_URI` in framework."

parents 1a6f762f fb2176c4

core/api/current.txt

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

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

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

    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_SENSORS_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT";

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

+3 −0
Original line number Diff line number Diff line
@@ -1330,7 +1330,10 @@ public class DevicePolicyManager { 
     *

     * <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE} or

     * {@link #ACTION_PROVISION_MANAGED_DEVICE}

     *

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

     */

    @Deprecated

    public static final String EXTRA_PROVISIONING_LOGO_URI =

            "android.app.extra.PROVISIONING_LOGO_URI";