Merge "TrustManagerService: Fix service binding leak" into oc-dev (b0ebbc3d) · Commits · e / os / android_frameworks_base

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 {