From 89475fb3e5fdbf145ada4f472938053e133d01de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20So=C3=ABtard?= Date: Thu, 15 Jul 2021 10:18:19 +0000 Subject: [PATCH] Deprecating ACTION_STATE_USER_SETUP_COMPLETE Deprecating ACTION_STATE_USER_SETUP_COMPLETE that was previously used in the NFC provisioning flow, now the NFC provisioning flow uses the admin integrated flow and no longer launches an intent with this action when user provisioning completes. Test: No tests needed Bug: 192228539 Change-Id: I6849b9de72f13735995156e1a02a778cf66cf208 --- core/api/system-current.txt | 2 +- core/java/android/app/admin/DevicePolicyManager.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index c20b2e054980d..0af279bdc56c7 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -956,7 +956,7 @@ package android.app.admin { field public static final String ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE = "android.app.action.PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE"; field @RequiresPermission(android.Manifest.permission.MANAGE_FACTORY_RESET_PROTECTION) public static final String ACTION_RESET_PROTECTION_POLICY_CHANGED = "android.app.action.RESET_PROTECTION_POLICY_CHANGED"; field public static final String ACTION_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER"; - field public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE"; + field @Deprecated public static final String ACTION_STATE_USER_SETUP_COMPLETE = "android.app.action.STATE_USER_SETUP_COMPLETE"; field public static final String EXTRA_PROFILE_OWNER_NAME = "android.app.extra.PROFILE_OWNER_NAME"; field @Deprecated public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_ICON_URI"; field @Deprecated public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_LABEL"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 7e5b5a677efe6..a175b62165e57 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -332,8 +332,12 @@ public class DevicePolicyManager { * {@link android.Manifest.permission#DISPATCH_PROVISIONING_MESSAGE} to be launched. * Only one {@link ComponentName} in the entire system should be enabled, and the rest of the * components are not started by this intent. + * + * @deprecated Starting from Android T, the system no longer launches an intent with this action + * when user provisioning completes. * @hide */ + @Deprecated @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) @SystemApi public static final String ACTION_STATE_USER_SETUP_COMPLETE =