summaryrefslogtreecommitdiff
path: root/api/current.txt
diff options
context:
space:
mode:
author Esteban Talavera <etalavera@google.com> 2014-08-26 15:38:17 +0100
committer Esteban Talavera <etalavera@google.com> 2014-08-26 15:38:44 +0100
commitfbb28dfb9511679bc615c4424c21a901b2dba4cc (patch)
tree20625967f9b94f91001029953ec67366eb8f46ae /api/current.txt
parent5369d7a9317a137ca0b7ad43c889203a7669626f (diff)
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 'api/current.txt')
-rw-r--r--api/current.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 85a3fc526480..4d8d6355fbb8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5511,8 +5511,8 @@ package android.app.admin {
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_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.LOCAL_TIME";
field public static final java.lang.String EXTRA_PROVISIONING_TIME_ZONE = "android.app.extra.TIME_ZONE";