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.
2013-11-12 14:53:19 -08:00
parent 1d64812a35 f174b51626
commit 8a71cdaeb1
1 changed files with 1 additions and 0 deletions
--- a/services/java/com/android/server/DevicePolicyManagerService.java
+++ b/services/java/com/android/server/DevicePolicyManagerService.java
@@ -522,6 +522,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
                        || 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