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.
This commit is contained in:
Amith Yamasani
2013-11-12 14:53:19 -08:00
committed by Android Git Automerger

View File

@@ -522,6 +522,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
|| pm.getReceiverInfo(aa.info.getComponent(), 0, userHandle) == null) { || pm.getReceiverInfo(aa.info.getComponent(), 0, userHandle) == null) {
removed = true; removed = true;
policy.mAdminList.remove(i); policy.mAdminList.remove(i);
policy.mAdminMap.remove(aa.info.getComponent());
} }
} catch (RemoteException re) { } catch (RemoteException re) {
// Shouldn't happen // Shouldn't happen