From 47f968235122f8b4f7c426a6c7300122783f7b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= <ivanbuper@google.com>
Date: Tue, 17 Jan 2023 15:04:17 +0000
Subject: [PATCH] Make getRoutingSessionInfo() public

Having access to the underlying RoutingSessionInfo gives apps more
detailed information about their current routing session.

Test: atest CtsMediaBetterTogetherTestCases
Bug: 221284469
Bug: 238178508
Change-Id: Idd3b58f074260eeb100816c98a7eaf5f938b9c1e
---
 core/api/current.txt                       |  1 +
 media/java/android/media/MediaRouter2.java | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index bec2559bb4610..bd4e3789b156f 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -24038,6 +24038,7 @@ package android.media {
     method @Nullable public android.os.Bundle getControlHints();
     method @NonNull public java.util.List<android.media.MediaRoute2Info> getDeselectableRoutes();
     method @NonNull public String getId();
+    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 public int getVolume();
diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java
index fa74a9f12d7c4..a7959c5dabdda 100644
--- a/media/java/android/media/MediaRouter2.java
+++ b/media/java/android/media/MediaRouter2.java
@@ -1514,6 +1514,16 @@ public final class MediaRouter2 {
             return getRoutesWithIds(deselectableRouteIds);
         }
 
+        /**
+         * Returns the current {@link RoutingSessionInfo} associated to this controller.
+         */
+        @NonNull
+        public RoutingSessionInfo getRoutingSessionInfo() {
+            synchronized (mControllerLock) {
+                return mSessionInfo;
+            }
+        }
+
         /**
          * Gets the information about how volume is handled on the session.
          *
@@ -1873,13 +1883,6 @@ public final class MediaRouter2 {
             return result.toString();
         }
 
-        @NonNull
-        RoutingSessionInfo getRoutingSessionInfo() {
-            synchronized (mControllerLock) {
-                return mSessionInfo;
-            }
-        }
-
         void setRoutingSessionInfo(@NonNull RoutingSessionInfo info) {
             synchronized (mControllerLock) {
                 mSessionInfo = info;