commit 8a71cdaeb159af1bf851264c8ad5d037a705bcfa
author Amith Yamasani <yamasani@google.com> Tue Nov 12 14:53:19 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 12 14:53:19 2013 -0800
tree d3cdaa2fc5bc20b1180fcdd5c17f0c5a787b802c
parent 1d64812a35350692e0a770dcf278fab45ff855c8
parent f174b5162664da2cb7f1e91c2b03324711540ba2

am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev

* commit 'f174b5162664da2cb7f1e91c2b03324711540ba2':
  Fix inconsistency in reporting device admin active state.

services/java/com/android/server/DevicePolicyManagerService.java

diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java
index 8cc80f7..1c3b9bb 100644
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -522,6 +522,7 @@
                         || pm.getReceiverInfo(aa.info.getComponent(), 0, userHandle) == null) {
                     removed = true;
                     policy.mAdminList.remove(i);
+                    policy.mAdminMap.remove(aa.info.getComponent());
                 }
             } catch (RemoteException re) {
                 // Shouldn't happen