Merge "Fix wrong device being considered selected" into main

2 files changed, 18 insertions, 2 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
index ceb6f7b080df..13276608c03d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
@@ -864,8 +864,7 @@ public abstract class InfoMediaManager {
             }
 
             // Add selected routes first.
-            if (com.android.media.flags.Flags.enableOutputSwitcherSessionGrouping()
-                    && sortedRouteIds.size() != selectedRoutes.size()) {
+            if (sortedRouteIds.size() != selectedRoutes.size()) {
                 for (MediaRoute2Info selectedRoute : selectedRoutes) {
                     sortedRouteIds.add(selectedRoute.getId());
                 }
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
index 219ad6ca3f1a..93ebc84374b2 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/media/InfoMediaManagerTest.java
@@ -1003,4 +1003,21 @@ public class InfoMediaManagerTest {
         assertThat(routeOrder.get(2).getId()).isEqualTo(TEST_ID_4);
         assertThat(routeOrder.get(3).getId()).isEqualTo(TEST_ID_1);
     }
+
+    @Test
+    public void selectedRouteAppearsFirst() {
+        RouteListingPreference routeListingPreference =
+                setUpPreferenceList(TEST_PACKAGE_NAME, true);
+        List<MediaRoute2Info> routes = setAvailableRoutesList(TEST_PACKAGE_NAME);
+        List<MediaRoute2Info> selectedRoutes = List.of(routes.get(2));
+
+        List<MediaRoute2Info> routeOrder =
+                Api34Impl.arrangeRouteListByPreference(
+                        selectedRoutes, routes, routeListingPreference);
+
+        assertThat(routeOrder.stream().map(MediaRoute2Info::getId).toArray())
+                .asList()
+                .containsExactly(TEST_ID_4, TEST_ID_1, TEST_ID_3)
+                .inOrder();
+    }
 }