From c3bf1130a61cf5f60b020140bde3a561e6dab70a Mon Sep 17 00:00:00 2001
From: Kyunglyul Hyun <klhyun@google.com>
Date: Mon, 26 Oct 2020 10:33:21 +0000
Subject: [PATCH] Make MediaController#controlsSameSession

Add it as @Deprecated since there is an alternative.

Bug: 161331118
Test: cts media
Change-Id: I82ea17ad11aa147308f4274ec3f82acaba71109c
---
 api/current.txt                                |  1 +
 .../android/media/session/MediaController.java | 18 +++++-------------
 non-updatable-api/current.txt                  |  1 +
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 05f1027f3130a..16f03ff5fff00 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28803,6 +28803,7 @@ package android.media.session {
   public final class MediaController {
     ctor public MediaController(@NonNull android.content.Context, @NonNull android.media.session.MediaSession.Token);
     method public void adjustVolume(int, int);
+    method @Deprecated public boolean controlsSameSession(@Nullable android.media.session.MediaController);
     method public boolean dispatchMediaButtonEvent(@NonNull android.view.KeyEvent);
     method @Nullable public android.os.Bundle getExtras();
     method public long getFlags();
diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java
index 3af2e17960ae0..38e2bdfc308d4 100644
--- a/media/java/android/media/session/MediaController.java
+++ b/media/java/android/media/session/MediaController.java
@@ -22,7 +22,6 @@ import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SystemApi;
 import android.app.PendingIntent;
-import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.content.pm.ParceledListSlice;
 import android.media.AudioAttributes;
@@ -462,21 +461,14 @@ public final class MediaController {
         return mTag;
     }
 
-    /*
-     * @hide
-     */
-    ISessionController getSessionBinder() {
-        return mSessionBinder;
-    }
-
     /**
-     * @hide
+     * Returns whether this and {@code other} media controller controls the same session.
+     * @deprecated Check equality of {@link #getSessionToken() tokens} instead.
      */
-    @UnsupportedAppUsage(publicAlternatives = "Check equality of {@link #getSessionToken() tokens}"
-            + "instead.")
-    public boolean controlsSameSession(MediaController other) {
+    @Deprecated
+    public boolean controlsSameSession(@Nullable MediaController other) {
         if (other == null) return false;
-        return mSessionBinder.asBinder() == other.getSessionBinder().asBinder();
+        return mToken.equals(other.mToken);
     }
 
     private void addCallbackLocked(Callback cb, Handler handler) {
diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt
index addb25d717e56..e5bc20ad78fe6 100644
--- a/non-updatable-api/current.txt
+++ b/non-updatable-api/current.txt
@@ -28564,6 +28564,7 @@ package android.media.session {
   public final class MediaController {
     ctor public MediaController(@NonNull android.content.Context, @NonNull android.media.session.MediaSession.Token);
     method public void adjustVolume(int, int);
+    method @Deprecated public boolean controlsSameSession(@Nullable android.media.session.MediaController);
     method public boolean dispatchMediaButtonEvent(@NonNull android.view.KeyEvent);
     method @Nullable public android.os.Bundle getExtras();
     method public long getFlags();