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

Commit d4aaab99 authored by Jessica Hummel's avatar Jessica Hummel Committed by Android (Google) Code Review
Browse files

Merge "Use correct string for provisioning complete action." into lmp-dev

parents 3b9309a0 5669216e

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5406,7 +5406,7 @@ package android.app.admin { 
    field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING";

    field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";

    field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";

    field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE";

    field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";

    field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";

    field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";

    field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";

core/java/android/app/admin/DeviceAdminReceiver.java

+9 −0
Original line number Diff line number Diff line
@@ -221,6 +221,12 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_PROFILE_PROVISIONING_COMPLETE =

            "android.app.action.PROFILE_PROVISIONING_COMPLETE";



    /**

     * Do not use, replaced by {@link #ACTION_PROFILE_PROVISIONING_COMPLETE}

     */

    private static final String LEGACY_ACTION_PROFILE_PROVISIONING_COMPLETE =

            "android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE";



    /**
@@ -431,6 +437,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver { 
            onPasswordExpiring(context, intent);

        } else if (ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {

            onProfileProvisioningComplete(context, intent);

        // TODO: remove when nobody depends on this 

        } else if (LEGACY_ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {

            onProfileProvisioningComplete(context, intent);

        } else if (ACTION_LOCK_TASK_ENTERING.equals(action)) {

            String pkg = intent.getStringExtra(EXTRA_LOCK_TASK_PACKAGE);

            onLockTaskModeEntering(context, intent, pkg);