summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/admin
diff options
context:
space:
mode:
authorSander Alewijnse <salewijnse@google.com>2014-09-04 11:23:09 +0100
committerSander Alewijnse <salewijnse@google.com>2014-09-04 12:28:52 +0100
commitaff9f4cb88c8f540bf6b22079107d9424ab63b22 (patch)
tree0c0a70b22006d552d8ae0f1dc7ddbf64116a2916 /core/java/android/app/admin
parentae62d71d36022a7a62e00abc447c680f6d3ee83f (diff)
downloadframeworks_base-aff9f4cb88c8f540bf6b22079107d9424ab63b22.zip
frameworks_base-aff9f4cb88c8f540bf6b22079107d9424ab63b22.tar.gz
frameworks_base-aff9f4cb88c8f540bf6b22079107d9424ab63b22.tar.bz2
Rename email extra to email bundle key.
Bug:17197410 Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
Diffstat (limited to 'core/java/android/app/admin')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java18
1 files changed, 6 insertions, 12 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 282444a..668de62 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -151,18 +151,12 @@ public class DevicePolicyManager {
= "android.app.extra.DEFAULT_MANAGED_PROFILE_NAME";
/**
- * A String extra that, holds the email address of the account which a managed profile is
- * created for. Used with {@link #ACTION_PROVISION_MANAGED_PROFILE} and
- * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}.
- *
- * <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 EXTRA_PROVISIONING_EMAIL_ADDRESS
- = "android.app.extra.ManagedProfileEmailAddress";
+ * A bundle key, used in the bundle extra {@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}. The
+ * corresponding value holds the email address of the account which the managed profile is
+ * created for.
+ */
+ public static final String KEY_PROVISIONING_EMAIL_ADDRESS
+ = "android.app.key.ManagedProfileEmailAddress";
/**
* A String extra holding the time zone {@link android.app.AlarmManager} that the device