Merge "Make TvInputManagerService robust against user race conditions" (6341be1d) · Commits · e / os / android_frameworks_base

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

+31 −25

Original line number	Diff line number	Diff line
		@@ -383,6 +383,7 @@ public final class TvInputManagerService extends SystemService {
		if (mCurrentUserId == userId) {
		return;
		}
		if (mUserStates.contains(mCurrentUserId)) {
		UserState userState = mUserStates.get(mCurrentUserId);
		List<SessionState> sessionStatesToRelease = new ArrayList<>();
		for (SessionState sessionState : userState.sessionStateMap.values()) {
		@@ -415,6 +416,7 @@ public final class TvInputManagerService extends SystemService {
		it.remove();
		}
		}
		}

		mCurrentUserId = userId;
		getOrCreateUserStateLocked(userId);
		@@ -490,6 +492,10 @@ public final class TvInputManagerService extends SystemService {
		userState.mainSessionToken = null;

		mUserStates.remove(userId);

		if (userId == mCurrentUserId) {
		switchUser(UserHandle.USER_SYSTEM);
		}
		}
		}