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

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

Merge "[Fix] Bluetooth device ordering" into rvc-qpr-dev am: a6b0836e 

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

Change-Id: Ib466ddd323da4c09d002b7e90d1ba0045425c216
parents 881130bd a6b0836e

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

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ public class LocalMediaManager implements BluetoothCallback { 


    void dispatchDeviceListUpdate() {

        final List<MediaDevice> mediaDevices = new ArrayList<>(mMediaDevices);

        Collections.sort(mediaDevices, COMPARATOR);

        for (DeviceCallback callback : getCallbacks()) {

            callback.onDeviceListUpdate(mediaDevices);

        }
@@ -465,6 +464,7 @@ public class LocalMediaManager implements BluetoothCallback { 
            synchronized (mMediaDevicesLock) {

                mMediaDevices.clear();

                mMediaDevices.addAll(devices);

                Collections.sort(devices, COMPARATOR);

                // Add disconnected bluetooth devices only when phone output device is available.

                for (MediaDevice device : devices) {

                    final int type = device.getDeviceType();