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

Commit 26af3f18 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Avoid connecting the device again when the device is already connected" into sc-v2-dev

parents 0a771d17 38c191d6

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

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,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
@@ -198,7 +198,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;

            playSwitchingAnim(mConnectedItem, view);

            mController.connectDevice(device);