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

Commit 54b4ad99 authored by Pablo Soëtard's avatar Pablo Soëtard Committed by Android (Google) Code Review
Browse files

Merge "Deprecating ACTION_STATE_USER_SETUP_COMPLETE"

parents 431be389 89475fb3

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

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

+4 −0
Original line number Diff line number Diff line
@@ -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 =