TrustManagerService: Fix service binding leak

Fixes an issue where TrustAgentWrapper was created too early.
If we later decide to not actually start that agent, it is already
bound to, and then we just drop the TrustAgentWrapper class, never
unbinding.

In addition, this can also create a rebind loop where we are constantly
trying to rebind to the trust agent.

Bug: 37853858
Test: force-lock, observe that trust agents are properly unbound and not constantly trying to rebind
Change-Id: I4d383f9cb499874803a7f024915baf85b3682631

1 files changed, 5 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 f4f7e2403f0c..8e06a51238ee 100644
--- a/services/core/java/com/android/server/trust/TrustManagerService.java
+++ b/services/core/java/com/android/server/trust/TrustManagerService.java
@@ -325,8 +325,6 @@ public class TrustManagerService extends SystemService {
                     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);
@@ -363,6 +361,11 @@ public class TrustManagerService extends SystemService {
                     }
                 }
 
+                if (agentInfo.agent == null) {
+                    agentInfo.agent = new TrustAgentWrapper(mContext, this,
+                            new Intent().setComponent(name), userInfo.getUserHandle());
+                }
+
                 if (!mActiveAgents.contains(agentInfo)) {
                     mActiveAgents.add(agentInfo);
                 } else {