summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Hummel <jhummel@google.com>2014-03-13 16:05:26 +0000
committerJessica Hummel <jhummel@google.com>2014-03-17 16:53:27 +0000
commit03dd22079cc43ae0a008e5080a45fe665d29a69c (patch)
treec77f95600bad60e1ea091dc3485d4edfec7eca71
parenta1e4bf9b6c817f9b1558faabb949bbe516f3a187 (diff)
downloadframeworks_base-03dd22079cc43ae0a008e5080a45fe665d29a69c.zip
frameworks_base-03dd22079cc43ae0a008e5080a45fe665d29a69c.tar.gz
frameworks_base-03dd22079cc43ae0a008e5080a45fe665d29a69c.tar.bz2
Standardize the provisioning intent action.
Change-Id: Iea7f8827cf4b52e2e97e8675687412108dd917e4
-rw-r--r--api/current.txt2
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt
index 4f71a80..23229d4 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4797,7 +4797,7 @@ package android.app.admin {
method public int setStorageEncryption(android.content.ComponentName, boolean);
method public void wipeData(int);
field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN";
- field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.managedprovisioning.ACTION_PROVISION_MANAGED_PROFILE";
+ field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.ACTION_PROVISION_MANAGED_PROFILE";
field public static final java.lang.String ACTION_SET_NEW_PASSWORD = "android.app.action.SET_NEW_PASSWORD";
field public static final java.lang.String ACTION_START_ENCRYPTION = "android.app.action.START_ENCRYPTION";
field public static final int ENCRYPTION_STATUS_ACTIVATING = 2; // 0x2
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index e06cf38..30c84f6 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -95,7 +95,7 @@ public class DevicePolicyManager {
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_PROVISION_MANAGED_PROFILE
- = "android.managedprovisioning.ACTION_PROVISION_MANAGED_PROFILE";
+ = "android.app.action.ACTION_PROVISION_MANAGED_PROFILE";
/**
* A String extra holding the name of the package of the mobile device management application