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

am a387dc16: Merge "Use correct string for provisioning complete action." into lmp-dev

Browse Source 
* commit 'a387dc16b436d9d76b247c8f623157acb6df88ad':
  Use correct string for provisioning complete action.
This commit is contained in:
Jessica Hummel
2014-09-12 18:51:34 +00:00
committed by Android Git Automerger
parent 72097d120e d4aaab99bb
commit 66c365f2e3
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -5406,7 +5406,7 @@ package android.app.admin {
field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING";
field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED";
field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED";
field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE";
field public static final java.lang.String ACTION_PROFILE_PROVISIONING_COMPLETE = "android.app.action.PROFILE_PROVISIONING_COMPLETE";
field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";
field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";

9
core/java/android/app/admin/DeviceAdminReceiver.java
View File

@@ -221,6 +221,12 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
*/
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_PROFILE_PROVISIONING_COMPLETE =
"android.app.action.PROFILE_PROVISIONING_COMPLETE";
/**
* Do not use, replaced by {@link #ACTION_PROFILE_PROVISIONING_COMPLETE}
*/
private static final String LEGACY_ACTION_PROFILE_PROVISIONING_COMPLETE =
"android.app.action.ACTION_PROFILE_PROVISIONING_COMPLETE";
/**
@@ -431,6 +437,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
onPasswordExpiring(context, intent);
} else if (ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {
onProfileProvisioningComplete(context, intent);
// TODO: remove when nobody depends on this
} else if (LEGACY_ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {
onProfileProvisioningComplete(context, intent);
} else if (ACTION_LOCK_TASK_ENTERING.equals(action)) {
String pkg = intent.getStringExtra(EXTRA_LOCK_TASK_PACKAGE);
onLockTaskModeEntering(context, intent, pkg);