commit e2b2514342448b97d7658dd4920b339a5239274c
author Adrian Roos <roosa@google.com> Wed Apr 30 15:51:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 30 15:51:48 2014 +0000
tree aa70dab96dccadedf7704a44bc345cf0dd25ae12
parent 7f89c9b8e6724e4316c294eb9f0dde4a46b61e87
parent 81e046645def5ded2cc72740b251df0ebe40334c

Merge "Fix broken trust agent reloading"

services/core/java/com/android/server/trust/TrustManagerService.java

diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java
index a2a49c9..97aa4f57 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -187,12 +187,12 @@
 
         boolean trustMayHaveChanged = false;
         for (int i = 0; i < mObsoleteAgents.size(); i++) {
-            AgentInfo info = mActiveAgents.valueAt(i);
+            AgentInfo info = mObsoleteAgents.valueAt(i);
             if (info.agent.isTrusted()) {
                 trustMayHaveChanged = true;
             }
             info.agent.unbind();
-            mActiveAgents.remove(info);
+            mObsoleteAgents.remove(info);
         }
 
         if (trustMayHaveChanged) {