Merge "Deprecating ACTION_STATE_USER_SETUP_COMPLETE"
This commit is contained in:
committed by
Android (Google) Code Review
commit
54b4ad9923
@@ -957,7 +957,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";
|
||||
|
||||
@@ -333,8 +333,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 =
|
||||
|
||||
Reference in New Issue
Block a user