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

2022-03-22 12:43:52 +00:00
parent e7ed33a577 3a45847457
commit fdf328c2b5
1 changed files with 2 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputController.java
@@ -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;
    }