Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev (b38e0757) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DeviceAdminReceiver.java

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -223,12 +223,6 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	public static final String ACTION_PROFILE_PROVISIONING_COMPLETE =		public static final String ACTION_PROFILE_PROVISIONING_COMPLETE =
	"android.app.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";

	/**		/**
	* Name under which a DevicePolicy component publishes information		* Name under which a DevicePolicy component publishes information
	* about itself. This meta-data must reference an XML resource containing		* about itself. This meta-data must reference an XML resource containing
	@@ -437,9 +431,6 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
	onPasswordExpiring(context, intent);		onPasswordExpiring(context, intent);
	} else if (ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {		} else if (ACTION_PROFILE_PROVISIONING_COMPLETE.equals(action)) {
	onProfileProvisioningComplete(context, intent);		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)) {		} else if (ACTION_LOCK_TASK_ENTERING.equals(action)) {
	String pkg = intent.getStringExtra(EXTRA_LOCK_TASK_PACKAGE);		String pkg = intent.getStringExtra(EXTRA_LOCK_TASK_PACKAGE);
	onLockTaskModeEntering(context, intent, pkg);		onLockTaskModeEntering(context, intent, pkg);