diff options
| author | Adrian Roos <roosa@google.com> | 2014-04-30 15:51:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-30 15:51:48 +0000 |
| commit | e2b2514342448b97d7658dd4920b339a5239274c (patch) | |
| tree | aa70dab96dccadedf7704a44bc345cf0dd25ae12 | |
| parent | 7f89c9b8e6724e4316c294eb9f0dde4a46b61e87 (diff) | |
| parent | 81e046645def5ded2cc72740b251df0ebe40334c (diff) | |
| download | frameworks_base-e2b2514342448b97d7658dd4920b339a5239274c.zip frameworks_base-e2b2514342448b97d7658dd4920b339a5239274c.tar.gz frameworks_base-e2b2514342448b97d7658dd4920b339a5239274c.tar.bz2 | |
Merge "Fix broken trust agent reloading"
| -rw-r--r-- | services/core/java/com/android/server/trust/TrustManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/trust/TrustManagerService.java b/services/core/java/com/android/server/trust/TrustManagerService.java index a2a49c9..97aa4f5 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 @@ public class TrustManagerService extends SystemService { 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) { |