commit ef9c523848e76490270c3e954aab10369c56f602
author Esteban Talavera <etalavera@google.com> Mon Sep 08 13:51:18 2014 +0100
committer Esteban Talavera <etalavera@google.com> Tue Sep 09 17:14:43 2014 +0100
tree 74f8f4453e79ae5fb9c4a76a01654f0bdebf3054
parent fbc3f1984a1630186b8f37f8be951ae3033441ce

Update string value for provisioning action and extra

As per API review. This will be submitted in sync with a new version of DMAgent, as the string is hardcoded there.

Bug: 17389863
Change-Id: I3a3d7a9cf05bcb713da8690ceec6af02845a5ff1

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

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 926a348..9c1b199 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -112,7 +112,7 @@
      */
     @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
     public static final String ACTION_PROVISION_MANAGED_PROFILE
-        = "android.app.action.ACTION_PROVISION_MANAGED_PROFILE";
+        = "android.app.action.PROVISION_MANAGED_PROFILE";
 
     /**
      * A {@link android.os.Parcelable} extra of type {@link android.os.PersistableBundle} that allows
@@ -139,7 +139,7 @@
      * 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.deviceAdminPackageName";
+        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME";
 
     /**
      * A String extra holding the default name of the profile that is created during managed profile