From 1bc02694eac1472326db750af02ab7a37ef51e89 Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Mon, 22 Feb 2021 11:24:21 +0800
Subject: [PATCH] [Fix] Bluetooth device ordering

-Caused by sorting whole list
-It should sort connected devices, and then, to add all disconnected
devices from getMostRecentlyConnectedDevices()

Bug: 176850941
Test: atest LocalMediaManagerTest
Change-Id: I123e70d0616d3fab0a29658e29421ee94aec3094
(cherry picked from commit a4cf89aa16078e49e9e0d162ae64cc96abf72569)
---
 .../src/com/android/settingslib/media/LocalMediaManager.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
index 72a6074ff89c3..9d477251c2e35 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
@@ -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();