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

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

Merge "Changed value of EXTRAs to match constant name in code." into lmp-dev

parents 248b3696 37f0184d

api/current.txt

+17 −17
Original line number Diff line number Diff line
@@ -5507,23 +5507,23 @@ package android.app.admin { 
    field public static final int ENCRYPTION_STATUS_UNSUPPORTED = 0; // 0x0

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

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

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

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

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.WIFI_HIDDEN";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.WIFI_PAC_URL";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PASSWORD = "android.app.extra.WIFI_PASSWORD";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS = "android.app.extra.WIFI_PROXY_BYPASS_HOSTS";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_HOST = "android.app.extra.WIFI_PROXY_HOST";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.WIFI_PROXY_PORT";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.WIFI_SSID";

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

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_HIDDEN = "android.app.extra.PROVISIONING_WIFI_HIDDEN";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PAC_URL = "android.app.extra.PROVISIONING_WIFI_PAC_URL";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PASSWORD = "android.app.extra.PROVISIONING_WIFI_PASSWORD";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_HOST = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_PROXY_PORT = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";

    field public static final java.lang.String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";

    field public static int FLAG_MANAGED_CAN_ACCESS_PARENT;

    field public static int FLAG_PARENT_CAN_ACCESS_MANAGED;

    field public static final int KEYGUARD_DISABLE_FEATURES_ALL = 2147483647; // 0x7fffffff
@@ -5534,7 +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 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

+17 −17
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class DevicePolicyManager { 
     * during the managed profile provisioning.

     */

    public static final String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE =

            "android.app.extra.ADMIN_EXTRA_BUNDLE";

            "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE";



    /**

     * A String extra holding the package name of the mobile device management application that
@@ -148,7 +148,7 @@ public class DevicePolicyManager { 
     * <p>Use with {@link #ACTION_PROVISION_MANAGED_PROFILE}

     */

    public static final String EXTRA_PROVISIONING_DEFAULT_MANAGED_PROFILE_NAME

        = "android.app.extra.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
@@ -156,7 +156,7 @@ public class DevicePolicyManager { 
     * created for.

     */

    public static final String KEY_PROVISIONING_EMAIL_ADDRESS

        = "android.app.key.ManagedProfileEmailAddress";

        = "android.app.key.PROVISIONING_EMAIL_ADDRESS";



    /**

     * A String extra holding the time zone {@link android.app.AlarmManager} that the device
@@ -166,7 +166,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_TIME_ZONE

        = "android.app.extra.TIME_ZONE";

        = "android.app.extra.PROVISIONING_TIME_ZONE";



    /**

     * A Long extra holding the wall clock time (in milliseconds) to be set on the device's
@@ -176,7 +176,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_LOCAL_TIME

        = "android.app.extra.LOCAL_TIME";

        = "android.app.extra.PROVISIONING_LOCAL_TIME";



    /**

     * A String extra holding the {@link java.util.Locale} that the device will be set to.
@@ -186,7 +186,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_LOCALE

        = "android.app.extra.LOCALE";

        = "android.app.extra.PROVISIONING_LOCALE";



    /**

     * A String extra holding the ssid of the wifi network that should be used during nfc device
@@ -196,7 +196,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_SSID

        = "android.app.extra.WIFI_SSID";

        = "android.app.extra.PROVISIONING_WIFI_SSID";



    /**

     * A boolean extra indicating whether the wifi network in {@link #EXTRA_PROVISIONING_WIFI_SSID}
@@ -206,7 +206,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_HIDDEN

        = "android.app.extra.WIFI_HIDDEN";

        = "android.app.extra.PROVISIONING_WIFI_HIDDEN";



    /**

     * A String extra indicating the security type of the wifi network in
@@ -216,7 +216,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE

        = "android.app.extra.WIFI_SECURITY_TYPE";

        = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";



    /**

     * A String extra holding the password of the wifi network in
@@ -226,7 +226,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PASSWORD

        = "android.app.extra.WIFI_PASSWORD";

        = "android.app.extra.PROVISIONING_WIFI_PASSWORD";



    /**

     * A String extra holding the proxy host for the wifi network in
@@ -236,7 +236,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_HOST

        = "android.app.extra.WIFI_PROXY_HOST";

        = "android.app.extra.PROVISIONING_WIFI_PROXY_HOST";



    /**

     * An int extra holding the proxy port for the wifi network in
@@ -246,7 +246,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_PORT

        = "android.app.extra.WIFI_PROXY_PORT";

        = "android.app.extra.PROVISIONING_WIFI_PROXY_PORT";



    /**

     * A String extra holding the proxy bypass for the wifi network in
@@ -256,7 +256,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS

        = "android.app.extra.WIFI_PROXY_BYPASS_HOSTS";

        = "android.app.extra.PROVISIONING_WIFI_PROXY_BYPASS";



    /**

     * A String extra holding the proxy auto-config (PAC) URL for the wifi network in
@@ -266,7 +266,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_WIFI_PAC_URL

        = "android.app.extra.WIFI_PAC_URL";

        = "android.app.extra.PROVISIONING_WIFI_PAC_URL";



    /**

     * A String extra holding a url that specifies the download location of the device admin
@@ -276,7 +276,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";



    /**

     * A String extra holding a http cookie header which should be used in the http request to the
@@ -286,7 +286,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";



    /**

     * A String extra holding the SHA-1 checksum of the file at download location specified in
@@ -298,7 +298,7 @@ public class DevicePolicyManager { 
     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_CHECKSUM";

        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";



    /**

     * This MIME type is used for starting the Device Owner provisioning.