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

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

Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev

parents f030e66f aaf2f3e8

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

+11 −0
Original line number Diff line number Diff line
@@ -148,6 +148,17 @@ public class DevicePolicyManager { 
    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME";



    /**

     * An {@link android.accounts.Account} extra holding the account to migrate during managed

     * profile provisioning. If the account supplied is present in the primary user, it will be

     * copied, along with its credentials to the managed profile and removed from the primary user.

     *

     * Use with {@link #ACTION_PROVISION_MANAGED_PROFILE}.

     */



    public static final String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE

        = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE";



    /**

     * A String extra that, holds the email address of the account which a managed profile is

     * created for. Used with {@link #ACTION_PROVISION_MANAGED_PROFILE} and