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

Commit e3da790f authored by Jessica Hummel's avatar Jessica Hummel
Browse files

Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 

Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
parent 699a49b9

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -5510,7 +5510,6 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_ADD_EXPLANATION = "android.app.extra.ADD_EXPLANATION";

    field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN";

    field public static final java.lang.String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE";

    field public static final java.lang.String EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME = "android.app.extra.PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";

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

+9 −13
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ public class DevicePolicyManager { 
     * Provisioning adds a managed profile and sets the mdm as the profile owner who has full

     * control over the profile

     *

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

     * {@link #EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME} and {@link #EXTRA_DEVICE_ADMIN}.

     * <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
@@ -142,18 +141,15 @@ public class DevicePolicyManager { 
        = "android.app.extra.deviceAdminPackageName";



    /**

     * A String extra holding the default name of the profile that is created during managed profile

     * provisioning.

     * 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

     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}.

     *

     * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE}

     */

    public static final String EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME

        = "android.app.extra.PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME";



    /**

     * A bundle key, used in the bundle extra {@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}. The

     * corresponding value holds the email address of the account which the managed profile is

     * created for.

     * <p> If the {@link #ACTION_PROVISION_MANAGED_PROFILE} intent that starts managed provisioning

     * contains this extra, it is forwarded in the

     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} intent to the mobile

     * device management application that was set as the profile owner during provisioning.

     * It is usually used to avoid that the user has to enter their email address twice.

     */

    public static final String KEY_PROVISIONING_EMAIL_ADDRESS

        = "android.app.key.PROVISIONING_EMAIL_ADDRESS";