From 137acf7384afe7ea307f365a306a6c2b24449db1 Mon Sep 17 00:00:00 2001
From: Alan Huang <alanjhhuang@google.com>
Date: Tue, 5 Oct 2021 15:56:38 +0000
Subject: [PATCH] Fix device ordering

Should sort the devices before adding to the list.

Bug: 183690996
Test: atest LocalMediaManagerTest
Change-Id: I491d6e4218480ed112ed9f7b122a5673a6c8cf03
---
 .../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 22001c9c925a8..c40b7b7d88af0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/LocalMediaManager.java
@@ -479,9 +479,9 @@ public class LocalMediaManager implements BluetoothCallback {
         @Override
         public void onDeviceListAdded(List<MediaDevice> devices) {
             synchronized (mMediaDevicesLock) {
+                Collections.sort(devices, COMPARATOR);
                 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();