Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9824a10c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up null checks for PlaybackInfo in MediaRouter2Manager" into main

parents 83c9a77d 7b8ac1c9

media/java/android/media/MediaRouter2Manager.java

+0 −7
Original line number Diff line number Diff line
@@ -402,9 +402,6 @@ public final class MediaRouter2Manager { 
    @Nullable

    public RoutingSessionInfo getRoutingSessionForMediaController(MediaController mediaController) {

        MediaController.PlaybackInfo playbackInfo = mediaController.getPlaybackInfo();

        if (playbackInfo == null) {

            return null;

        }

        if (playbackInfo.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) {

            return getSystemRoutingSession(mediaController.getPackageName());

        }
@@ -959,10 +956,6 @@ public final class MediaRouter2Manager { 
    private boolean areSessionsMatched(MediaController mediaController,

            RoutingSessionInfo sessionInfo) {

        MediaController.PlaybackInfo playbackInfo = mediaController.getPlaybackInfo();

        if (playbackInfo == null) {

            return false;

        }



        String volumeControlId = playbackInfo.getVolumeControlId();

        if (volumeControlId == null) {

            return false;