Merge "Fix wrong device being considered selected" into main

1 files changed, 1 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());
                 }