diff options
| author | Jessica Hummel <jhummel@google.com> | 2014-09-12 19:19:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 19:19:46 +0000 |
| commit | f5f5ed7bc30d610b23d113d7a56d5c84041a89f0 (patch) | |
| tree | d8183b01036ce61c64dfb656bb2b8ee0c758121a | |
| parent | 446bb6117dff5f5588e35709043059c0364a6d3d (diff) | |
| parent | eac08ca0d21bf3634bca7777526c63f40502475f (diff) | |
| download | frameworks_base-f5f5ed7bc30d610b23d113d7a56d5c84041a89f0.zip frameworks_base-f5f5ed7bc30d610b23d113d7a56d5c84041a89f0.tar.gz frameworks_base-f5f5ed7bc30d610b23d113d7a56d5c84041a89f0.tar.bz2 | |
am 61896e3b: am 5a082a9e: Merge "Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE." into lmp-dev
* commit '61896e3ba7c75bd062f6fa3a3ba2c2bfd7a8826f':
Remove legacy version of ACTION_PROFILE_PROVISIONING_COMPLETE.
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 836f682..e9cce51 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -224,12 +224,6 @@ public class DeviceAdminReceiver extends BroadcastReceiver { "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 * about itself. This meta-data must reference an XML resource containing * a device-admin tag. XXX TO DO: describe syntax. @@ -437,9 +431,6 @@ 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); |