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

Commit aff9f4cb authored by Sander Alewijnse's avatar Sander Alewijnse
Browse files

Rename email extra to email bundle key. 

Bug:17197410
Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
parent ae62d71d

api/current.txt

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

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

    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME = "android.app.extra.deviceAdminPackageName";

    field public static final java.lang.String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.ManagedProfileEmailAddress";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCALE = "android.app.extra.LOCALE";

    field public static final java.lang.String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.LOCAL_TIME";

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.TIME_ZONE";
@@ -5535,6 +5534,7 @@ package android.app.admin { 
    field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10

    field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8

    field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1

    field public static final java.lang.String KEY_PROVISIONING_EMAIL_ADDRESS = "android.app.key.ManagedProfileEmailAddress";

    field public static final java.lang.String MIME_TYPE_PROVISIONING_NFC = "application/com.android.managedprovisioning";

    field public static final int PASSWORD_QUALITY_ALPHABETIC = 262144; // 0x40000

    field public static final int PASSWORD_QUALITY_ALPHANUMERIC = 327680; // 0x50000

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

+6 −12
Original line number Diff line number Diff line
@@ -151,18 +151,12 @@ public class DevicePolicyManager { 
        = "android.app.extra.DEFAULT_MANAGED_PROFILE_NAME";



    /**

     * 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> 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 EXTRA_PROVISIONING_EMAIL_ADDRESS

        = "android.app.extra.ManagedProfileEmailAddress";

     * 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.

     */

    public static final String KEY_PROVISIONING_EMAIL_ADDRESS

        = "android.app.key.ManagedProfileEmailAddress";



    /**

     * A String extra holding the time zone {@link android.app.AlarmManager} that the device