From 99dd4d84e3d4c74198526796afdbd2d0165c4dfb Mon Sep 17 00:00:00 2001
From: Derek Jedral <derekjedral@google.com>
Date: Thu, 6 Feb 2025 21:00:01 +0000
Subject: Rename output switcher grouping flag

This flag was originally not listed as a bugfix. The suggestion from the
release team is to re-define the flag.

Test: atest
Bug: 394907674
Flag: com.android.media.flags.enable_output_switcher_device_grouping
Change-Id: Icb50a5a013c29b0a3267b8b1ca192f05f0ecfcc0
---
 .../src/com/android/settingslib/media/InfoMediaManager.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 69e41a36f48f..aa84571c73d0 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
@@ -779,7 +779,7 @@ public abstract class InfoMediaManager {
         static List<RouteListingPreference.Item> composePreferenceRouteListing(
                 RouteListingPreference routeListingPreference) {
             boolean preferRouteListingOrdering =
-                    com.android.media.flags.Flags.enableOutputSwitcherSessionGrouping()
+                    com.android.media.flags.Flags.enableOutputSwitcherDeviceGrouping()
                     && preferRouteListingOrdering(routeListingPreference);
             List<RouteListingPreference.Item> finalizedItemList = new ArrayList<>();
             List<RouteListingPreference.Item> itemList = routeListingPreference.getItems();
@@ -814,7 +814,7 @@ public abstract class InfoMediaManager {
          * Returns an ordered list of available devices based on the provided {@code
          * routeListingPreferenceItems}.
          *
-         * <p>The resulting order if enableOutputSwitcherSessionGrouping is disabled is:
+         * <p>The resulting order if enableOutputSwitcherDeviceGrouping is disabled is:
          *
          * <ol>
          *   <li>Selected routes.
@@ -822,7 +822,7 @@ public abstract class InfoMediaManager {
          *   <li>Not-selected, non-system, available routes sorted by route listing preference.
          * </ol>
          *
-         * <p>The resulting order if enableOutputSwitcherSessionGrouping is enabled is:
+         * <p>The resulting order if enableOutputSwitcherDeviceGrouping is enabled is:
          *
          * <ol>
          *   <li>Selected routes sorted by route listing preference.
@@ -848,7 +848,7 @@ public abstract class InfoMediaManager {
             Set<String> sortedRouteIds = new LinkedHashSet<>();
 
             boolean addSelectedRlpItemsFirst =
-                    com.android.media.flags.Flags.enableOutputSwitcherSessionGrouping()
+                    com.android.media.flags.Flags.enableOutputSwitcherDeviceGrouping()
                     && preferRouteListingOrdering(routeListingPreference);
             Set<String> selectedRouteIds = new HashSet<>();
 
-- 
cgit v1.2.3-59-g8ed1b