commit 07a13b9ce74a0b70fb8d3f41f554a345e1b2e3d8
author Adrian Roos <roosa@google.com> Thu May 04 20:04:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 20:04:08 2017 +0000
tree ec6fc5fb0696e4ee5541b838bd7ede4115abf718
parent f634af37ca9c27e68e49c75d6f53102f7c4c7919
parent 0a8cc3ab7c7401d050bf472abad56fdaaf08dfdb

Merge "TrustManagerService: Fix service binding leak" into oc-dev am: b0ebbc3d2c
am: 0a8cc3ab7c

Change-Id: I557d2ccf3be85953e54465e7691d4599465c1fb4

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 e1dcb0e..c6393e7 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -327,8 +327,6 @@
                     agentInfo.label = resolveInfo.loadLabel(pm);
                     agentInfo.icon = resolveInfo.loadIcon(pm);
                     agentInfo.settings = getSettingsAttrs(pm, resolveInfo);
-                    agentInfo.agent = new TrustAgentWrapper(mContext, this,
-                            new Intent().setComponent(name), userInfo.getUserHandle());
                 } else {
                     int index = mActiveAgents.indexOf(agentInfo);
                     agentInfo = mActiveAgents.valueAt(index);
@@ -365,6 +363,11 @@
                     }
                 }
 
+                if (agentInfo.agent == null) {
+                    agentInfo.agent = new TrustAgentWrapper(mContext, this,
+                            new Intent().setComponent(name), userInfo.getUserHandle());
+                }
+
                 if (!mActiveAgents.contains(agentInfo)) {
                     mActiveAgents.add(agentInfo);
                 } else {