Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Standardize the provisioning intent action."

Browse Source
This commit is contained in:
Jessica Hummel
2014-03-17 18:01:27 +00:00
committed by Android (Google) Code Review
parent 432f755d44 03dd22079c
commit f1c9044057
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -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

2
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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