commit | 48dab493b927f4a71687ccd557084ccee195de73 | [log] [tgz] |
---|---|---|
author | Amith Yamasani <yamasani@google.com> | Tue Nov 12 22:47:55 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Nov 12 22:47:55 2013 +0000 |
tree | 7ad57e91b33aad104677fc9e125107bc0b417c67 | |
parent | c641de017ae0b15bbc13f43fd14fca6b1523ec02 [diff] | |
parent | f65c0a99583cfaa8119836b8691d3a79db21dbbf [diff] |
Merge "Fix inconsistency in reporting device admin active state." into klp-dev
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