From 8b7c8ffb862824974cfe15bc8a3722926fb693d6 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 24 Sep 2024 08:12:28 -0700
Subject: [PATCH] Misc cleanup for session token

Improved string representation for legacy token and
import for unambigious class name.

PiperOrigin-RevId: 678256188
---
 .../androidx/media3/session/SessionTokenImplLegacy.java  | 2 +-
 .../java/androidx/media3/session/SessionTokenTest.java   | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libraries/session/src/main/java/androidx/media3/session/SessionTokenImplLegacy.java b/libraries/session/src/main/java/androidx/media3/session/SessionTokenImplLegacy.java
index 540e276b7a..c84640fe12 100644
--- a/libraries/session/src/main/java/androidx/media3/session/SessionTokenImplLegacy.java
+++ b/libraries/session/src/main/java/androidx/media3/session/SessionTokenImplLegacy.java
@@ -112,7 +112,7 @@ import com.google.common.base.Objects;
 
   @Override
   public String toString() {
-    return "SessionToken {legacyToken=" + legacyToken + "}";
+    return "SessionToken {legacy, uid=" + uid + "}";
   }
 
   @Override
diff --git a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/SessionTokenTest.java b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/SessionTokenTest.java
index 1b97d02a55..43304b054a 100644
--- a/libraries/test_session_current/src/androidTest/java/androidx/media3/session/SessionTokenTest.java
+++ b/libraries/test_session_current/src/androidTest/java/androidx/media3/session/SessionTokenTest.java
@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat;
 
 import android.content.ComponentName;
 import android.content.Context;
+import android.media.session.MediaSession.Token;
 import android.os.Bundle;
 import android.os.Process;
 import android.support.v4.media.session.MediaSessionCompat;
@@ -121,10 +122,7 @@ public class SessionTokenTest {
             new MediaSessionCompat(context, "createSessionToken_withLegacyToken"));
 
     SessionToken token =
-        SessionToken.createSessionToken(
-                context,
-                (android.media.session.MediaSession.Token)
-                    sessionCompat.getSessionToken().getToken())
+        SessionToken.createSessionToken(context, (Token) sessionCompat.getSessionToken().getToken())
             .get(TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
     assertThat(token.isLegacySession()).isTrue();
@@ -149,8 +147,7 @@ public class SessionTokenTest {
       throws Exception {
     // TODO(b/194458970): Make the callback of session and controller on the same thread work and
     //  remove the threadTestRule
-    AtomicReference<android.media.session.MediaSession.Token> platformToken =
-        new AtomicReference<>();
+    AtomicReference<Token> platformToken = new AtomicReference<>();
     MediaSession session =
         threadTestRule
             .getHandler()