From 6dc2dafdd5109c2d101f286e2251b14476552286 Mon Sep 17 00:00:00 2001
From: Iván Budnik <ivanbuper@google.com>
Date: Fri, 9 Feb 2024 13:20:11 +0000
Subject: Promote RoutingController#getTransferableRoutes() to public API

Test: Presubmit
Bug: 323154573
Change-Id: Ia4f55125d980fb20ac11932af4e7eaa1031b2bab
---
 core/api/current.txt                                         | 1 +
 media/java/android/media/MediaRouter2.java                   | 4 +++-
 media/java/android/media/flags/media_better_together.aconfig | 7 +++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index f41982ff75bf..4ef58adaba10 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -24445,6 +24445,7 @@ package android.media {
     method @NonNull public android.media.RoutingSessionInfo getRoutingSessionInfo();
     method @NonNull public java.util.List<android.media.MediaRoute2Info> getSelectableRoutes();
     method @NonNull public java.util.List<android.media.MediaRoute2Info> getSelectedRoutes();
+    method @FlaggedApi("com.android.media.flags.enable_get_transferable_routes") @NonNull public java.util.List<android.media.MediaRoute2Info> getTransferableRoutes();
     method public int getVolume();
     method public int getVolumeHandling();
     method public int getVolumeMax();
diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java
index 425db06ce55f..f7007d096bd5 100644
--- a/media/java/android/media/MediaRouter2.java
+++ b/media/java/android/media/MediaRouter2.java
@@ -19,6 +19,7 @@ package android.media;
 import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
 import static com.android.media.flags.Flags.FLAG_ENABLE_BUILT_IN_SPEAKER_ROUTE_SUITABILITY_STATUSES;
 import static com.android.media.flags.Flags.FLAG_ENABLE_CROSS_USER_ROUTING_IN_MEDIA_ROUTER2;
+import static com.android.media.flags.Flags.FLAG_ENABLE_GET_TRANSFERABLE_ROUTES;
 import static com.android.media.flags.Flags.FLAG_ENABLE_RLP_CALLBACKS_IN_MEDIA_ROUTER2;
 
 import android.Manifest;
@@ -1532,8 +1533,9 @@ public final class MediaRouter2 {
         /**
          * Returns the unmodifiable list of transferable routes for the session.
          *
-         * @hide
+         * @see RoutingSessionInfo#getTransferableRoutes()
          */
+        @FlaggedApi(FLAG_ENABLE_GET_TRANSFERABLE_ROUTES)
         @NonNull
         public List<MediaRoute2Info> getTransferableRoutes() {
             List<String> transferableRoutes;
diff --git a/media/java/android/media/flags/media_better_together.aconfig b/media/java/android/media/flags/media_better_together.aconfig
index df9ecdc98e85..298c4e4bbd88 100644
--- a/media/java/android/media/flags/media_better_together.aconfig
+++ b/media/java/android/media/flags/media_better_together.aconfig
@@ -84,6 +84,13 @@ flag {
     bug: "295518668"
 }
 
+flag {
+    name: "enable_get_transferable_routes"
+    namespace: "media_solutions"
+    description: "Exposes RoutingController#getTransferableRoutes() (previously hidden) to the public API."
+    bug: "323154573"
+}
+
 flag {
     name: "enable_prevention_of_keep_alive_route_providers"
     namespace: "media_solutions"
-- 
cgit v1.2.3-59-g8ed1b