diff options
| author | 2013-11-12 14:53:19 -0800 | |
|---|---|---|
| committer | 2013-11-12 14:53:19 -0800 | |
| commit | 8a71cdaeb159af1bf851264c8ad5d037a705bcfa (patch) | |
| tree | d3cdaa2fc5bc20b1180fcdd5c17f0c5a787b802c | |
| parent | 1d64812a35350692e0a770dcf278fab45ff855c8 (diff) | |
| parent | f174b5162664da2cb7f1e91c2b03324711540ba2 (diff) | |
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.
| -rw-r--r-- | services/java/com/android/server/DevicePolicyManagerService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 8cc80f7d70d3..1c3b9bb234af 100644 --- 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 |