Merge "Fix inconsistency in reporting device admin active state." into klp-dev

This commit is contained in:
Amith Yamasani
2013-11-12 22:47:55 +00:00
committed by Android (Google) Code Review

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