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

Commit eeab1fa9 authored by Alexandra Gherghina's avatar Alexandra Gherghina Committed by Android (Google) Code Review
Browse files

Merge "New intent action for returning account migration result"

parents 82223785 db4bc577

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5532,6 +5532,7 @@ package android.app.admin { 
    method public void uninstallCaCert(android.content.ComponentName, byte[]);

    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_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.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";

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5633,6 +5633,7 @@ package android.app.admin { 
    method public void uninstallCaCert(android.content.ComponentName, byte[]);

    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_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";

    field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.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_SET_PROFILE_OWNER = "android.app.action.SET_PROFILE_OWNER";

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

+19 −3
Original line number Diff line number Diff line
@@ -111,9 +111,11 @@ public class DevicePolicyManager { 
     *

     * <p>This intent must contain the extra {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}.

     *

     * <p> When managed provisioning has completed, an intent of the type

     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcasted to the

     * managed profile.

     * <p> When managed provisioning has completed, broadcasts are sent to the application specified

     * in the provisioning intent. The

     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} broadcast is sent in the

     * managed profile and the {@link #ACTION_MANAGED_PROFILE_PROVISIONED} broadcast is sent in

     * the primary profile.

     *

     * <p> If provisioning fails, the managedProfile is removed so the device returns to its

     * previous state.
@@ -331,6 +333,20 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";



    /**

     * Broadcast Action: This broadcast is sent to indicate that provisioning of a managed profile

     * has completed successfully.

     *

     * <p>The broadcast is limited to the primary profile, to the app specified in the provisioning

     * intent (@see #ACTION_PROVISION_MANAGED_PROFILE).

     *

     * <p>This intent will contain the extra {@link EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE} which

     * corresponds to the account requested to be migrated at provisioning time, if any.

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_MANAGED_PROFILE_PROVISIONED

        = "android.app.action.MANAGED_PROFILE_PROVISIONED";



    /**

     * A boolean extra indicating whether device encryption is required as part of Device Owner

     * provisioning.