From 45ad2e5ce3418a11ba79def36fcc316c1278c90e Mon Sep 17 00:00:00 2001 From: Derek Jedral Date: Tue, 4 Feb 2025 20:37:23 +0000 Subject: Fix wrong device being considered selected ag/31194237 has an incorrect condition check where we add selected routes. The check is supposed to be gated behind the flag, but instead the entire logic on added sorted routes was gated instead. Bug: 394165966 Test: atest, local test Flag: com.android.media.flags.enable_output_switcher_session_grouping Change-Id: I285c6cf3cc6864e199f0067116e14d10c1464f94 --- .../src/com/android/settingslib/media/InfoMediaManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages/SettingsLib/src') 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()); } -- cgit v1.2.3-59-g8ed1b