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

Commit d469a0b9 authored by Esteban Talavera's avatar Esteban Talavera
Browse files

Set last phrase for constant values of EXTRA_* fields to ALL_CAPS 

As requested in the API review.

Bug: 17005622,16486199
Change-Id: I6f60a43fe23526cfe855d81015feb759cf643926
parent 5e85359a

api/current.txt

+17 −17
Original line number Diff line number Diff line
@@ -5494,23 +5494,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_DEFAULT_MANAGED_PROFILE_NAME = "android.app.extra.defaultManagedProfileName";

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

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

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

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

    field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.timeZone";

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

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

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

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

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

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

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

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

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

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

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

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME

        = "android.app.extra.deviceAdminPackageName";

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_NAME";



    /**

     * A String extra holding the default name of the profile that is created during managed profile
@@ -136,7 +136,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.defaultManagedProfileName";

        = "android.app.extra.DEFAULT_MANAGED_PROFILE_NAME";



    /**

     * A String extra that, holds the email address of the account which a managed profile is
@@ -150,7 +150,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.ManagedProfileEmailAddress";

        = "android.app.extra.MANAGED_PROFILE_EMAIL_ADDRESS";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_TIME_ZONE

        = "android.app.extra.timeZone";

        = "android.app.extra.TIME_ZONE";



    /**

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

     * will be set to.

     * A Long extra holding the wall clock time (in milliseconds) to be set on the device's

     * {@link android.app.AlarmManager}.

     *

     * <p>Use in an Nfc record with {@link #PROVISIONING_NFC_MIME_TYPE} that starts device owner

     * provisioning via an Nfc bump.

     */

    public static final String EXTRA_PROVISIONING_LOCAL_TIME

        = "android.app.extra.localTime";

        = "android.app.extra.LOCAL_TIME";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_LOCALE

        = "android.app.extra.locale";

        = "android.app.extra.LOCALE";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_SSID

        = "android.app.extra.wifiSsid";

        = "android.app.extra.WIFI_SSID";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_HIDDEN

        = "android.app.extra.wifiHidden";

        = "android.app.extra.WIFI_HIDDEN";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE

        = "android.app.extra.wifiSecurityType";

        = "android.app.extra.WIFI_SECURITY_TYPE";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_PASSWORD

        = "android.app.extra.wifiPassword";

        = "android.app.extra.WIFI_PASSWORD";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_HOST

        = "android.app.extra.wifiProxyHost";

        = "android.app.extra.WIFI_PROXY_HOST";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_PORT

        = "android.app.extra.wifiProxyPort";

        = "android.app.extra.WIFI_PROXY_PORT";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_PROXY_BYPASS

        = "android.app.extra.wifiProxyBypassHosts";

        = "android.app.extra.WIFI_PROXY_BYPASS_HOSTS";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_WIFI_PAC_URL

        = "android.app.extra.wifiPacUrl";

        = "android.app.extra.WIFI_PAC_URL";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION

        = "android.app.extra.deviceAdminPackageDownloadLocation";

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER

        = "android.app.extra.deviceAdminPackageDownloadCookieHeader";

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";



    /**

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

     */

    public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM

        = "android.app.extra.deviceAdminPackageChecksum";

        = "android.app.extra.DEVICE_ADMIN_PACKAGE_CHECKSUM";



    /**

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