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

Commit 09811685 authored by Sander Alewijnse's avatar Sander Alewijnse Committed by Android (Google) Code Review
Browse files

Merge "Rename email extra." into lmp-dev

parents 3e7115ed 2b338a27

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5522,6 +5522,7 @@ package android.app.admin { 
    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";

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

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

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

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

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.PROVISIONING_TIME_ZONE";
@@ -5543,7 +5544,6 @@ 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.PROVISIONING_EMAIL_ADDRESS";

    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

+4 −2
Original line number Diff line number Diff line
@@ -148,14 +148,16 @@ public class DevicePolicyManager { 
     * created for. Used with {@link #ACTION_PROVISION_MANAGED_PROFILE} and

     * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}.

     *

     * <p> This extra is part of the {@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}.

     *

     * <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";

    public static final String EXTRA_PROVISIONING_EMAIL_ADDRESS

        = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";



    /**

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