Merge "[Output switcher] Check current device" into tm-dev

This commit is contained in:
Shaowei Shen
2022-04-12 00:14:37 +00:00
committed by Android (Google) Code Review

View File

@@ -88,8 +88,11 @@ public class MediaOutputDialog extends MediaOutputBaseDialog {
@Override @Override
int getStopButtonVisibility() { int getStopButtonVisibility() {
boolean isActiveRemoteDevice = mMediaOutputController.isActiveRemoteDevice( boolean isActiveRemoteDevice = false;
mMediaOutputController.getCurrentConnectedMediaDevice()); if (mMediaOutputController.getCurrentConnectedMediaDevice() != null) {
isActiveRemoteDevice = mMediaOutputController.isActiveRemoteDevice(
mMediaOutputController.getCurrentConnectedMediaDevice());
}
boolean isBroadCastSupported = isBroadcastSupported(); boolean isBroadCastSupported = isBroadcastSupported();
return (isActiveRemoteDevice || isBroadCastSupported) ? View.VISIBLE : View.GONE; return (isActiveRemoteDevice || isBroadCastSupported) ? View.VISIBLE : View.GONE;