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

Commit f73dd5a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "presubmit-am-eb743dcef6874f73b81d4e42bb9d33ba" into... 

Merge changes from topic "presubmit-am-eb743dcef6874f73b81d4e42bb9d33ba" into sc-v2-dev-plus-aosp am: 70566e58

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

Change-Id: I422515b49628f8ec5682e956551dfc22feb467b9
parents 154a3c55 70566e58

packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java

+2 −2
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ public class LocalMediaManager implements BluetoothCallback { 
            }

        }



        if (device == mCurrentConnectedDevice) {

            Log.d(TAG, "connectDevice() this device all ready connected! : " + device.getName());

        if (device.equals(mCurrentConnectedDevice)) {

            Log.d(TAG, "connectDevice() this device is already connected! : " + device.getName());

            return false;

        }

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

+4 −1
Original line number Diff line number Diff line
@@ -213,7 +213,10 @@ public class MediaOutputAdapter extends MediaOutputBaseAdapter { 
            if (mController.isTransferring()) {

                return;

            }



            if (isCurrentlyConnected(device)) {

                Log.d(TAG, "This device is already connected! : " + device.getName());

                return;

            }

            mCurrentActivePosition = -1;

            mController.connectDevice(device);

            device.setState(MediaDeviceState.STATE_CONNECTING);