Merge "Add MediaRouter2.RoutingController#getOriginalId() as @TestApi"

api/test-current.txt

@@ -1478,6 +1478,10 @@ package android.media {
     method @NonNull public String getOriginalId();
   }
 
+  public class MediaRouter2.RoutingController {
+    method @NonNull public String getOriginalId();
+  }
+
   public final class PlaybackParams implements android.os.Parcelable {
     method public int getAudioStretchMode();
     method public android.media.PlaybackParams setAudioStretchMode(int);

media/java/android/media/MediaRouter2.java

@@ -21,6 +21,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainMessa
 import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
@@ -721,8 +722,7 @@ public class MediaRouter2 {
             RoutingController newController) {
         for (TransferCallbackRecord record: mTransferCallbackRecords) {
             record.mExecutor.execute(
-                    () -> record.mTransferCallback.onTransferred(oldController,
-                            newController));
+                    () -> record.mTransferCallback.onTransferred(oldController, newController));
         }
     }
 
@@ -865,6 +865,20 @@ public class MediaRouter2 {
             }
         }
 
+        /**
+         * Gets the original session id set by
+         * {@link RoutingSessionInfo.Builder#Builder(String, String)}.
+         *
+         * @hide
+         */
+        @NonNull
+        @TestApi
+        public String getOriginalId() {
+            synchronized (mControllerLock) {
+                return mSessionInfo.getOriginalId();
+            }
+        }
+
         /**
          * @return the control hints used to control routing session if available.
          */