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

Commit 75b3fafe authored by Esteban Talavera's avatar Esteban Talavera Committed by Android (Google) Code Review
Browse files

Merge "Revert API constants to previous value to match hardcoded value in... 

Merge "Revert API constants to previous value to match hardcoded value in google3 apps" into lmp-dev
parents 1698297d fbb28dfb

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -5511,8 +5511,8 @@ package android.app.admin { 
    field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.DEVICE_ADMIN_PACKAGE_CHECKSUM";

    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.DEVICE_ADMIN_PACKAGE_NAME";

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ public class DevicePolicyManager { 
     * message containing an Nfc record with MIME type {@link #MIME_TYPE_PROVISIONING_NFC}.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_NAME";

        = "android.app.extra.deviceAdminPackageName";



    /**

     * A String extra holding the default name of the profile that is created during managed profile
@@ -149,7 +149,7 @@ public class DevicePolicyManager { 
     * 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.MANAGED_PROFILE_EMAIL_ADDRESS";

        = "android.app.extra.ManagedProfileEmailAddress";



    /**

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