From fc04a7b235ed52aa1f2ba8b2b9cb41510c798fef Mon Sep 17 00:00:00 2001
From: Santiago Seifert <aquilescanta@google.com>
Date: Wed, 8 Feb 2023 16:32:20 +0000
Subject: Add cross protocol transfer support in output switcher

Bug: 268229454
Test: Manually using AndroidX MediaRouter sample app.
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest
Change-Id: Id5a25fbcb01e98ab43ffc9663ec86285d51a624e
---
 .../SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 85d4fab4170e..eae1b40411c3 100644
--- a/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/media/InfoMediaManager.java
@@ -508,7 +508,7 @@ public class InfoMediaManager extends MediaManager {
                         Api34Impl.composePreferenceRouteListing(
                                 routeListingPreference);
                 infos = Api34Impl.arrangeRouteListByPreference(selectedRouteInfos,
-                                infos,
+                                mRouterManager.getAvailableRoutes(packageName),
                                 preferenceRouteListing);
             }
             return Api34Impl.filterDuplicatedIds(infos);
-- 
cgit v1.2.3-59-g8ed1b