Merge "Only unbind agents of the user that is being refreshed" into lmp-dev (c727fb1f) · Commits · e / os / android_frameworks_base

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

+11 −4

Original line number	Diff line number	Diff line
		@@ -164,6 +164,11 @@ public class TrustManagerService extends SystemService {

		void refreshAgentList(int userId) {
		if (DEBUG) Slog.d(TAG, "refreshAgentList()");
		if (userId != UserHandle.USER_ALL && userId < UserHandle.USER_OWNER) {
		Log.e(TAG, "refreshAgentList(userId=" + userId + "): Invalid user handle,"
		+ " must be USER_ALL or a specific user.", new Throwable("here"));
		userId = UserHandle.USER_ALL;
		}
		PackageManager pm = mContext.getPackageManager();

		List<UserInfo> userInfos;
		@@ -223,12 +228,14 @@ public class TrustManagerService extends SystemService {
		boolean trustMayHaveChanged = false;
		for (int i = 0; i < obsoleteAgents.size(); i++) {
		AgentInfo info = obsoleteAgents.valueAt(i);
		if (userId == UserHandle.USER_ALL \|\| userId == info.userId) {
		if (info.agent.isManagingTrust()) {
		trustMayHaveChanged = true;
		}
		info.agent.unbind();
		mActiveAgents.remove(info);
		}
		}

		if (trustMayHaveChanged) {
		updateTrustAll();