summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorEsteban Talavera <etalavera@google.com>2014-08-26 15:38:17 +0100
committerEsteban Talavera <etalavera@google.com>2014-08-26 15:38:44 +0100
commitfbb28dfb9511679bc615c4424c21a901b2dba4cc (patch)
tree20625967f9b94f91001029953ec67366eb8f46ae /core/java/android
parent5369d7a9317a137ca0b7ad43c889203a7669626f (diff)
downloadframeworks_base-fbb28dfb9511679bc615c4424c21a901b2dba4cc.zip
frameworks_base-fbb28dfb9511679bc615c4424c21a901b2dba4cc.tar.gz
frameworks_base-fbb28dfb9511679bc615c4424c21a901b2dba4cc.tar.bz2
Revert API constants to previous value to match hardcoded value in google3 apps
Revert value of DevicePolicyManager constants that were hardcoded in dmagent. See previous change I6f60a43fe23526cfe855d81015feb759cf643926. Bug: 17275391,17005622 Change-Id: I606b010eb0399f7b34b59c99f96549949410bafc
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 41bbb87..b17309f 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -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