From fb2176c4934385368e7fda24f1a1650b9dc4060b Mon Sep 17 00:00:00 2001 From: Aleks Todorov Date: Thu, 4 Nov 2021 12:19:34 +0000 Subject: [PATCH] Deprecate `android.app.extra.PROVISIONING_LOGO_URI` in framework. Bug: 193879901 Test: Annotation-only change Change-Id: If99cc892eee723de45f7c5018247188741fa2298 --- core/api/current.txt | 2 +- core/java/android/app/admin/DevicePolicyManager.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/api/current.txt b/core/api/current.txt index b672baab56a65..30a74525d95dd 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -7606,7 +7606,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"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index a4227a4d30743..cc3f808402b1b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1330,7 +1330,10 @@ public class DevicePolicyManager { * *

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";