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

Commit 16f7b4a0 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output switcher] Check current device" into tm-dev am: 49ab8398 am: 3add1e63 

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



Change-Id: Ie3486080f01a905856860aee07e9abd5c70effdd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 565b6807 3add1e63

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

+5 −2
Original line number Diff line number Diff line
@@ -88,8 +88,11 @@ public class MediaOutputDialog extends MediaOutputBaseDialog { 


    @Override

    int getStopButtonVisibility() {

        boolean isActiveRemoteDevice = mMediaOutputController.isActiveRemoteDevice(

        boolean isActiveRemoteDevice = false;

        if (mMediaOutputController.getCurrentConnectedMediaDevice() != null) {

            isActiveRemoteDevice = mMediaOutputController.isActiveRemoteDevice(

                    mMediaOutputController.getCurrentConnectedMediaDevice());

        }

        boolean isBroadCastSupported = isBroadcastSupported();



        return (isActiveRemoteDevice || isBroadCastSupported) ? View.VISIBLE : View.GONE;