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

Commit 7b8ac1c9 authored by Iván Budnik's avatar Iván Budnik
Browse files

Clean up null checks for PlaybackInfo in MediaRouter2Manager 

This is a non-functional change.

Test: Presubmit.
Bug: 205124386
Flag: EXEMPT refactor
Change-Id: I6ae8863463fec0c27959dca0c042f5dadffc8bfa
parent b40d168b

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;