summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorSander Alewijnse <salewijnse@google.com>2014-09-12 12:28:40 +0100
committerSander Alewijnse <salewijnse@google.com>2014-09-12 12:28:40 +0100
commit2b338a27bef881cf751d1aeb6e42241e47e5e77b (patch)
tree31ce3211bbd7236dad2f1013ec5c92dc49b0dbfa /core/java/android
parentd09fbafa9242e67450c2f85807a159152d4761c8 (diff)
downloadframeworks_base-2b338a27bef881cf751d1aeb6e42241e47e5e77b.zip
frameworks_base-2b338a27bef881cf751d1aeb6e42241e47e5e77b.tar.gz
frameworks_base-2b338a27bef881cf751d1aeb6e42241e47e5e77b.tar.bz2
Rename email extra.
Bug:17389863 Change-Id: Ie001d71e92e212b83882529ed7c93303b64277c6
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 4a21913..13ed8d1 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -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