From 2d0b926c4d4efffb73760b56b21ee51456d6cdc6 Mon Sep 17 00:00:00 2001
From: shaoweishen <shaoweishen@google.com>
Date: Thu, 7 Apr 2022 10:29:05 +0000
Subject: [PATCH] [Output switcher] Check current device

Bug: 222020988
Test: N/A
Change-Id: Idc1677e6c25ac596edd880e15f70f4cdca9df241
---
 .../android/systemui/media/dialog/MediaOutputDialog.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java
index 3cffd0266ac83..fc10397804198 100644
--- a/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialog.java
@@ -88,8 +88,11 @@ public class MediaOutputDialog extends MediaOutputBaseDialog {
 
     @Override
     int getStopButtonVisibility() {
-        boolean isActiveRemoteDevice = mMediaOutputController.isActiveRemoteDevice(
-                mMediaOutputController.getCurrentConnectedMediaDevice());
+        boolean isActiveRemoteDevice = false;
+        if (mMediaOutputController.getCurrentConnectedMediaDevice() != null) {
+            isActiveRemoteDevice = mMediaOutputController.isActiveRemoteDevice(
+                    mMediaOutputController.getCurrentConnectedMediaDevice());
+        }
         boolean isBroadCastSupported = isBroadcastSupported();
 
         return (isActiveRemoteDevice || isBroadCastSupported) ? View.VISIBLE : View.GONE;