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

Commit ccb670c2 authored by tim peng's avatar tim peng Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Device status is not updated when a disconnected BT... 

Merge "[Output Switcher] Device status is not updated when a disconnected BT device is connected and activated" into sc-dev am: 435dc859

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

Change-Id: Ifbb749659433be184386fcbda3c81295c601b70a
parents febbb2fa 435dc859

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

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,9 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                mDivider.setVisibility(View.GONE);

                mAddIcon.setVisibility(View.GONE);

            }

            if (mCurrentActivePosition == position) {

                mCurrentActivePosition = -1;

            }

            if (mController.isTransferring()) {

                if (device.getState() == MediaDeviceState.STATE_CONNECTING

                        && !mController.hasAdjustVolumeUserRestriction()) {
@@ -214,6 +217,7 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
                return;

            }



            mCurrentActivePosition = -1;

            playSwitchingAnim(mConnectedItem, view);

            mController.connectDevice(device);

            device.setState(MediaDeviceState.STATE_CONNECTING);