Rename `MediaSession.Builder.setSessionCallback` to `setCallback`

Follow-up to https://github.com/androidx/media/commit/c78c1f5891afafebf70acdd678c32110b5092f98

PiperOrigin-RevId: 449492810

RELEASENOTES.md

@@ -98,10 +98,10 @@
         change([#51](https://github.com/androidx/media/issues/51)).
     *   Fix NPE in MediaControllerImplBase after releasing controller
         ([#74](https://github.com/androidx/media/issues/74)).
-    *   Rename `MediaSession.MediaSessionCallback` to `MediaSession.Callback`
-        and `MediaLibrarySession.MediaLibrarySession` to
-        `MediaLibrarySession.Callback` for consistency with other nested
-        listener and callbacks like `Player.Listener`.
+    *   Rename `MediaSession.MediaSessionCallback` to `MediaSession.Callback`,
+        `MediaLibrarySession.MediaLibrarySessionCallback` to
+        `MediaLibrarySession.Callback` and
+        `MediaSession.Builder.setSessionCallback` to `setCallback`.
 *   Data sources:
     *   Rename `DummyDataSource` to `PlaceHolderDataSource`.
     *   Workaround OkHttp interrupt handling.

libraries/session/src/main/java/androidx/media3/session/MediaSession.java

@@ -280,8 +280,8 @@ public class MediaSession {
      * @return The builder to allow chaining.
      */
     @Override
-    public Builder setSessionCallback(Callback callback) {
-      return super.setSessionCallback(callback);
+    public Builder setCallback(Callback callback) {
+      return super.setCallback(callback);
     }
 
     /**
@@ -769,8 +769,8 @@ public class MediaSession {
    * <p>The callback methods will be called from the application thread associated with the {@link
    * Player#getApplicationLooper() application looper} of the underlying {@link Player}.
    *
-   * <p>If it's not set by {@link MediaSession.Builder#setSessionCallback(Callback)}, the session
-   * will accept all controllers and all incoming commands by default.
+   * <p>If it's not set by {@link MediaSession.Builder#setCallback(Callback)}, the session will
+   * accept all controllers and all incoming commands by default.
    */
   public interface Callback {
 
@@ -1227,7 +1227,7 @@ public class MediaSession {
     }
 
     @SuppressWarnings("unchecked")
-    /* package */ U setSessionCallback(C callback) {
+    /* package */ U setCallback(C callback) {
       this.callback = checkNotNull(callback);
       return (U) this;
     }

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackTest.java

@@ -91,7 +91,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnPostConnect_afterConnected")
                 .build());
     controllerTestRule.createRemoteController(session.getToken());
@@ -117,7 +117,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnPostConnect_afterConnectionRejected")
                 .build());
     controllerTestRule.createRemoteController(session.getToken());
@@ -149,7 +149,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnCommandRequest")
                 .build());
     RemoteMediaController controller =
@@ -210,7 +210,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnCustomCommand")
                 .build());
     RemoteMediaController controller =
@@ -247,7 +247,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnSetMediaUri")
                 .build());
     RemoteMediaController controller =
@@ -287,7 +287,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnSetRating")
                 .build());
     RemoteMediaController controller =
@@ -323,7 +323,7 @@ public class MediaSessionCallbackTest {
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
-                .setSessionCallback(callback)
+                .setCallback(callback)
                 .setId("testOnSetRating")
                 .build());
     RemoteMediaController controller =
@@ -507,7 +507,7 @@ public class MediaSessionCallbackTest {
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
                 .setId("testOnConnect")
-                .setSessionCallback(
+                .setCallback(
                     new MediaSession.Callback() {
                       @Override
                       public MediaSession.ConnectionResult onConnect(
@@ -538,7 +538,7 @@ public class MediaSessionCallbackTest {
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
                 .setId("testOnDisconnected")
-                .setSessionCallback(
+                .setCallback(
                     new MediaSession.Callback() {
                       @Override
                       public void onDisconnected(MediaSession session, ControllerInfo controller) {

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionKeyEventTest.java

@@ -92,7 +92,7 @@ public class MediaSessionKeyEventTest {
     player = new MockPlayer.Builder().setApplicationLooper(handler.getLooper()).build();
 
     sessionCallback = new TestSessionCallback();
-    session = new MediaSession.Builder(context, player).setSessionCallback(sessionCallback).build();
+    session = new MediaSession.Builder(context, player).setCallback(sessionCallback).build();
 
     // Here's the requirement for an app to receive media key events via MediaSession.
     // - SDK < 26: Player should be playing for receiving key events

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPermissionTest.java

@@ -381,10 +381,7 @@ public class MediaSessionPermissionTest {
       this.session.release();
     }
     this.session =
-        new MediaSession.Builder(context, player)
-            .setId(SESSION_ID)
-            .setSessionCallback(callback)
-            .build();
+        new MediaSession.Builder(context, player).setId(SESSION_ID).setCallback(callback).build();
   }
 
   private SessionCommands createSessionCommandsWith(SessionCommand command) {

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPlayerTest.java

@@ -66,7 +66,7 @@ public class MediaSessionPlayerTest {
             .build();
     session =
         new MediaSession.Builder(ApplicationProvider.getApplicationContext(), player)
-            .setSessionCallback(
+            .setCallback(
                 new MediaSession.Callback() {
                   @Override
                   public MediaSession.ConnectionResult onConnect(

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionServiceTest.java

@@ -127,7 +127,7 @@ public class MediaSessionServiceTest {
             new MediaSession.Builder(
                     context, new MockPlayer.Builder().setApplicationLooper(looper).build())
                 .setId("testOnGetSession_returnsSession")
-                .setSessionCallback(
+                .setCallback(
                     new MediaSession.Callback() {
                       @Override
                       public MediaSession.ConnectionResult onConnect(

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionTest.java

@@ -84,7 +84,7 @@ public class MediaSessionTest {
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
                 .setId(TAG)
-                .setSessionCallback(
+                .setCallback(
                     new MediaSession.Callback() {
                       @Override
                       public MediaSession.ConnectionResult onConnect(
@@ -354,9 +354,7 @@ public class MediaSessionTest {
         };
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
-            new MediaSession.Builder(context, player)
-                .setSessionCallback(testSessionCallback)
-                .build());
+            new MediaSession.Builder(context, player).setCallback(testSessionCallback).build());
     controllerTestRule.createRemoteController(session.getToken());
     assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
   }
@@ -372,7 +370,7 @@ public class MediaSessionTest {
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
                 .setId("getSessionCompatToken_returnsCompatibleWithMediaControllerCompat")
-                .setSessionCallback(
+                .setCallback(
                     new MediaSession.Callback() {
                       @Override
                       public MediaSession.ConnectionResult onConnect(
@@ -426,7 +424,7 @@ public class MediaSessionTest {
         sessionTestRule.ensureReleaseAfterTest(
             new MediaSession.Builder(context, player)
                 .setId("getControllerVersion")
-                .setSessionCallback(sessionCallback)
+                .setCallback(sessionCallback)
                 .build());
     controllerTestRule.createRemoteController(session.getToken());
 

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionWithMediaControllerCompatTest.java

@@ -79,10 +79,7 @@ public class MediaSessionWithMediaControllerCompatTest {
 
     MediaSession session =
         sessionTestRule.ensureReleaseAfterTest(
-            new MediaSession.Builder(context, player)
-                .setId(TAG)
-                .setSessionCallback(callback)
-                .build());
+            new MediaSession.Builder(context, player).setId(TAG).setCallback(callback).build());
     RemoteMediaControllerCompat controllerCompat =
         remoteControllerTestRule.createRemoteControllerCompat(
             session.getSessionCompat().getSessionToken());

libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java

@@ -179,7 +179,7 @@ public class MediaSessionProviderService extends Service {
           }
         case TEST_CONTROLLER_LISTENER_SESSION_REJECTS:
           {
-            builder.setSessionCallback(
+            builder.setCallback(
                 new MediaSession.Callback() {
                   @Override
                   public MediaSession.ConnectionResult onConnect(
@@ -194,7 +194,7 @@ public class MediaSessionProviderService extends Service {
             SessionCommands availableSessionCommands =
                 SessionCommands.CREATOR.fromBundle(
                     tokenExtras.getBundle(KEY_AVAILABLE_SESSION_COMMANDS));
-            builder.setSessionCallback(
+            builder.setCallback(
                 new MediaSession.Callback() {
                   @Override
                   public MediaSession.ConnectionResult onConnect(

libraries/test_session_current/src/main/java/androidx/media3/session/MockMediaSessionService.java

@@ -66,7 +66,7 @@ public class MockMediaSessionService extends MediaSessionService {
       session =
           new MediaSession.Builder(MockMediaSessionService.this, player)
               .setId(ID)
-              .setSessionCallback(callback != null ? callback : new TestSessionCallback())
+              .setCallback(callback != null ? callback : new TestSessionCallback())
               .build();
     }
     return session;