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

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

Merge "Standardize the provisioning intent action."

parents 432f755d 03dd2207

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -4797,7 +4797,7 @@ package android.app.admin { 
    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void wipeData(int);

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

    field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.managedprovisioning.ACTION_PROVISION_MANAGED_PROFILE";

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

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

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

    field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class DevicePolicyManager { 
     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_PROVISION_MANAGED_PROFILE

        = "android.managedprovisioning.ACTION_PROVISION_MANAGED_PROFILE";

        = "android.app.action.ACTION_PROVISION_MANAGED_PROFILE";



    /**

     * A String extra holding the name of the package of the mobile device management application