Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b884bb28 authored by Adrian Roos's avatar Adrian Roos
Browse files

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
parent 9870d0be

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

+5 −2
Original line number Diff line number Diff line
@@ -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 {