Merge "TIF: fix callback cleanup logic in removeSessionStateLocked()." into lmp-dev (162fa7f4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/tv/TvInputManagerService.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -467,15 +467,19 @@ public final class TvInputManagerService extends SystemService {
		String inputId, int userId) {
		// Let clients know the create session requests are failed.
		UserState userState = getUserStateLocked(userId);
		List<SessionState> sessionsToAbort = new ArrayList<>();
		for (IBinder sessionToken : serviceState.mSessionTokens) {
		SessionState sessionState = userState.sessionStateMap.get(sessionToken);
		if (sessionState.mSession == null && (inputId == null
		\|\| sessionState.mInfo.getId().equals(inputId))) {
		removeSessionStateLocked(sessionToken, sessionState.mUserId);
		sessionsToAbort.add(sessionState);
		}
		}
		for (SessionState sessionState : sessionsToAbort) {
		removeSessionStateLocked(sessionState.mSessionToken, sessionState.mUserId);
		sendSessionTokenToClientLocked(sessionState.mClient,
		sessionState.mInfo.getId(), null, null, sessionState.mSeq);
		}
		}
		updateServiceConnectionLocked(serviceState.mComponent, userId);
		}

		@@ -759,10 +763,6 @@ public final class TvInputManagerService extends SystemService {
		clientState.mSessionTokens.remove(sessionToken);
		if (clientState.isEmpty()) {
		userState.clientStateMap.remove(sessionState.mClient.asBinder());
		if (userState.clientStateMap.isEmpty()) {
		// No longer need to keep the callbacks since there is no client.
		userState.callbackSet.clear();
		}
		}
		}