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

Commit 51f153f4 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Check before use MediaController" into tm-dev am: fdf328c2 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17219984

Change-Id: I4010ba144355996b14ce98a153c4fcea85946680
parents 003ed15b fdf328c2

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java

+2 −1
Original line number Diff line number Diff line
@@ -637,7 +637,8 @@ public class MediaOutputController implements LocalMediaManager.DeviceCallback, 
    }



    private boolean isPlayBackInfoLocal() {

        return mMediaController.getPlaybackInfo() != null

        return mMediaController != null

                && mMediaController.getPlaybackInfo() != null

                && mMediaController.getPlaybackInfo().getPlaybackType()

                == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL;

    }