Merge "Clean up null checks for PlaybackInfo in MediaRouter2Manager" into main (9824a10c) · Commits · e / os / android_frameworks_base

media/java/android/media/MediaRouter2Manager.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -402,9 +402,6 @@ public final class MediaRouter2Manager {
	@Nullable		@Nullable
	public RoutingSessionInfo getRoutingSessionForMediaController(MediaController mediaController) {		public RoutingSessionInfo getRoutingSessionForMediaController(MediaController mediaController) {
	MediaController.PlaybackInfo playbackInfo = mediaController.getPlaybackInfo();		MediaController.PlaybackInfo playbackInfo = mediaController.getPlaybackInfo();
	if (playbackInfo == null) {
	return null;
	}
	if (playbackInfo.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) {		if (playbackInfo.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
	return getSystemRoutingSession(mediaController.getPackageName());		return getSystemRoutingSession(mediaController.getPackageName());
	}		}
	@@ -959,10 +956,6 @@ public final class MediaRouter2Manager {
	private boolean areSessionsMatched(MediaController mediaController,		private boolean areSessionsMatched(MediaController mediaController,
	RoutingSessionInfo sessionInfo) {		RoutingSessionInfo sessionInfo) {
	MediaController.PlaybackInfo playbackInfo = mediaController.getPlaybackInfo();		MediaController.PlaybackInfo playbackInfo = mediaController.getPlaybackInfo();
	if (playbackInfo == null) {
	return false;
	}

	String volumeControlId = playbackInfo.getVolumeControlId();		String volumeControlId = playbackInfo.getVolumeControlId();
	if (volumeControlId == null) {		if (volumeControlId == null) {
	return false;		return false;