Merge "Move notifyCurrentChannelInfosUpdatedLocked after on-screen input updates" into main (6d3bf369) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1977,7 +1977,6 @@ public final class TvInputManagerService extends SystemService {
		\|\| !Objects.equals(sessionState.currentChannel, channelUri)) {
		sessionState.isCurrent = true;
		sessionState.currentChannel = channelUri;
		notifyCurrentChannelInfosUpdatedLocked(userState);
		if (!sessionState.isRecordingSession) {
		String sessionActualInputId = getSessionActualInputId(sessionState);
		if (!TextUtils.equals(mOnScreenInputId, sessionActualInputId)) {
		@@ -1989,6 +1988,7 @@ public final class TvInputManagerService extends SystemService {
		mOnScreenInputId = sessionActualInputId;
		mOnScreenSessionState = sessionState;
		}
		notifyCurrentChannelInfosUpdatedLocked(userState);
		}
		if (TvContract.isChannelUriForPassthroughInput(channelUri)) {
		// Do not log the watch history for passthrough inputs.
		@@ -4081,7 +4081,6 @@ public final class TvInputManagerService extends SystemService {
		UserState userState = getOrCreateUserStateLocked(mSessionState.userId);
		mSessionState.isCurrent = true;
		mSessionState.currentChannel = channelUri;
		notifyCurrentChannelInfosUpdatedLocked(userState);
		if (!mSessionState.isRecordingSession) {
		String sessionActualInputId = getSessionActualInputId(mSessionState);
		if (!TextUtils.equals(mOnScreenInputId, sessionActualInputId)) {
		@@ -4093,6 +4092,7 @@ public final class TvInputManagerService extends SystemService {
		mOnScreenInputId = sessionActualInputId;
		mOnScreenSessionState = mSessionState;
		}
		notifyCurrentChannelInfosUpdatedLocked(userState);
		}
		} catch (RemoteException e) {
		Slog.e(TAG, "error in onChannelRetuned", e);