Skip to content

SDK / exoplayer

Go to a project
Commit cd142872 by ibaker Committed by Ian Baker
Options

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

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

PiperOrigin-RevId: 449492810
parent 2a45dd39
Expand all
Inline Side-by-side
Showing with 66 additions and 77 deletions
RELEASENOTES.md
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* Fix bug that tracks are reset too often when using `MergingMediaSource`, * Fix bug that tracks are reset too often when using `MergingMediaSource`,
for example when side-loading subtitles and changing the selected for example when side-loading subtitles and changing the selected
subtitle mid-playback subtitle mid-playback
([#10248](https://github.com/google/ExoPlayer/issues/10248)). ([#10248](https://github.com/google/ExoPlayer/issues/10248)).
* Track selection: * Track selection:
* Flatten `TrackSelectionOverrides` class into `TrackSelectionParameters`, * Flatten `TrackSelectionOverrides` class into `TrackSelectionParameters`,
and promote `TrackSelectionOverride` to a top level class. and promote `TrackSelectionOverride` to a top level class.
...@@ -98,10 +98,10 @@ ...@@ -98,10 +98,10 @@
change([#51](https://github.com/androidx/media/issues/51)). change([#51](https://github.com/androidx/media/issues/51)).
* Fix NPE in MediaControllerImplBase after releasing controller * Fix NPE in MediaControllerImplBase after releasing controller
([#74](https://github.com/androidx/media/issues/74)). ([#74](https://github.com/androidx/media/issues/74)).
* Rename `MediaSession.MediaSessionCallback` to `MediaSession.Callback` * Rename `MediaSession.MediaSessionCallback` to `MediaSession.Callback`,
and `MediaLibrarySession.MediaLibrarySession` to `MediaLibrarySession.MediaLibrarySessionCallback` to
`MediaLibrarySession.Callback` for consistency with other nested `MediaLibrarySession.Callback` and
listener and callbacks like `Player.Listener`. `MediaSession.Builder.setSessionCallback` to `setCallback`.
* Data sources: * Data sources:
* Rename `DummyDataSource` to `PlaceHolderDataSource`. * Rename `DummyDataSource` to `PlaceHolderDataSource`.
* Workaround OkHttp interrupt handling. * Workaround OkHttp interrupt handling.
......
libraries/session/src/main/java/androidx/media3/session/MediaSession.java
...@@ -280,8 +280,8 @@ public class MediaSession { ...@@ -280,8 +280,8 @@ public class MediaSession {
* @return The builder to allow chaining. * @return The builder to allow chaining.
*/ */
@Override @Override
public Builder setSessionCallback(Callback callback) { public Builder setCallback(Callback callback) {
return super.setSessionCallback(callback); return super.setCallback(callback);
} }
/** /**
...@@ -769,8 +769,8 @@ public class MediaSession { ...@@ -769,8 +769,8 @@ public class MediaSession {
* <p>The callback methods will be called from the application thread associated with the {@link * <p>The callback methods will be called from the application thread associated with the {@link
* Player#getApplicationLooper() application looper} of the underlying {@link Player}. * Player#getApplicationLooper() application looper} of the underlying {@link Player}.
* *
* <p>If it's not set by {@link MediaSession.Builder#setSessionCallback(Callback)}, the session * <p>If it's not set by {@link MediaSession.Builder#setCallback(Callback)}, the session will
* will accept all controllers and all incoming commands by default. * accept all controllers and all incoming commands by default.
*/ */
public interface Callback { public interface Callback {
...@@ -1227,7 +1227,7 @@ public class MediaSession { ...@@ -1227,7 +1227,7 @@ public class MediaSession {
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
/* package */ U setSessionCallback(C callback) { /* package */ U setCallback(C callback) {
this.callback = checkNotNull(callback); this.callback = checkNotNull(callback);
return (U) this; return (U) this;
} }
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionCallbackTest.java
...@@ -91,7 +91,7 @@ public class MediaSessionCallbackTest { ...@@ -91,7 +91,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnPostConnect_afterConnected") .setId("testOnPostConnect_afterConnected")
.build()); .build());
controllerTestRule.createRemoteController(session.getToken()); controllerTestRule.createRemoteController(session.getToken());
...@@ -117,7 +117,7 @@ public class MediaSessionCallbackTest { ...@@ -117,7 +117,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnPostConnect_afterConnectionRejected") .setId("testOnPostConnect_afterConnectionRejected")
.build()); .build());
controllerTestRule.createRemoteController(session.getToken()); controllerTestRule.createRemoteController(session.getToken());
...@@ -149,7 +149,7 @@ public class MediaSessionCallbackTest { ...@@ -149,7 +149,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnCommandRequest") .setId("testOnCommandRequest")
.build()); .build());
RemoteMediaController controller = RemoteMediaController controller =
...@@ -210,7 +210,7 @@ public class MediaSessionCallbackTest { ...@@ -210,7 +210,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnCustomCommand") .setId("testOnCustomCommand")
.build()); .build());
RemoteMediaController controller = RemoteMediaController controller =
...@@ -247,7 +247,7 @@ public class MediaSessionCallbackTest { ...@@ -247,7 +247,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnSetMediaUri") .setId("testOnSetMediaUri")
.build()); .build());
RemoteMediaController controller = RemoteMediaController controller =
...@@ -287,7 +287,7 @@ public class MediaSessionCallbackTest { ...@@ -287,7 +287,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnSetRating") .setId("testOnSetRating")
.build()); .build());
RemoteMediaController controller = RemoteMediaController controller =
...@@ -323,7 +323,7 @@ public class MediaSessionCallbackTest { ...@@ -323,7 +323,7 @@ public class MediaSessionCallbackTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setSessionCallback(callback) .setCallback(callback)
.setId("testOnSetRating") .setId("testOnSetRating")
.build()); .build());
RemoteMediaController controller = RemoteMediaController controller =
...@@ -507,7 +507,7 @@ public class MediaSessionCallbackTest { ...@@ -507,7 +507,7 @@ public class MediaSessionCallbackTest {
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setId("testOnConnect") .setId("testOnConnect")
.setSessionCallback( .setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
...@@ -538,7 +538,7 @@ public class MediaSessionCallbackTest { ...@@ -538,7 +538,7 @@ public class MediaSessionCallbackTest {
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setId("testOnDisconnected") .setId("testOnDisconnected")
.setSessionCallback( .setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public void onDisconnected(MediaSession session, ControllerInfo controller) { 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 { ...@@ -92,7 +92,7 @@ public class MediaSessionKeyEventTest {
player = new MockPlayer.Builder().setApplicationLooper(handler.getLooper()).build(); player = new MockPlayer.Builder().setApplicationLooper(handler.getLooper()).build();
sessionCallback = new TestSessionCallback(); 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. // Here's the requirement for an app to receive media key events via MediaSession.
// - SDK < 26: Player should be playing for receiving key events // - 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 { ...@@ -381,10 +381,7 @@ public class MediaSessionPermissionTest {
this.session.release(); this.session.release();
} }
this.session = this.session =
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player).setId(SESSION_ID).setCallback(callback).build();
.setId(SESSION_ID)
.setSessionCallback(callback)
.build();
} }
private SessionCommands createSessionCommandsWith(SessionCommand command) { private SessionCommands createSessionCommandsWith(SessionCommand command) {
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionPlayerTest.java
...@@ -66,7 +66,7 @@ public class MediaSessionPlayerTest { ...@@ -66,7 +66,7 @@ public class MediaSessionPlayerTest {
.build(); .build();
session = session =
new MediaSession.Builder(ApplicationProvider.getApplicationContext(), player) new MediaSession.Builder(ApplicationProvider.getApplicationContext(), player)
.setSessionCallback( .setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionServiceTest.java
...@@ -127,7 +127,7 @@ public class MediaSessionServiceTest { ...@@ -127,7 +127,7 @@ public class MediaSessionServiceTest {
new MediaSession.Builder( new MediaSession.Builder(
context, new MockPlayer.Builder().setApplicationLooper(looper).build()) context, new MockPlayer.Builder().setApplicationLooper(looper).build())
.setId("testOnGetSession_returnsSession") .setId("testOnGetSession_returnsSession")
.setSessionCallback( .setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionTest.java
...@@ -84,7 +84,7 @@ public class MediaSessionTest { ...@@ -84,7 +84,7 @@ public class MediaSessionTest {
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setId(TAG) .setId(TAG)
.setSessionCallback( .setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
...@@ -354,9 +354,7 @@ public class MediaSessionTest { ...@@ -354,9 +354,7 @@ public class MediaSessionTest {
}; };
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player).setCallback(testSessionCallback).build());
.setSessionCallback(testSessionCallback)
.build());
controllerTestRule.createRemoteController(session.getToken()); controllerTestRule.createRemoteController(session.getToken());
assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue(); assertThat(latch.await(TIMEOUT_MS, MILLISECONDS)).isTrue();
} }
...@@ -372,7 +370,7 @@ public class MediaSessionTest { ...@@ -372,7 +370,7 @@ public class MediaSessionTest {
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setId("getSessionCompatToken_returnsCompatibleWithMediaControllerCompat") .setId("getSessionCompatToken_returnsCompatibleWithMediaControllerCompat")
.setSessionCallback( .setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
...@@ -426,7 +424,7 @@ public class MediaSessionTest { ...@@ -426,7 +424,7 @@ public class MediaSessionTest {
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player)
.setId("getControllerVersion") .setId("getControllerVersion")
.setSessionCallback(sessionCallback) .setCallback(sessionCallback)
.build()); .build());
controllerTestRule.createRemoteController(session.getToken()); controllerTestRule.createRemoteController(session.getToken());
......
libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaSessionWithMediaControllerCompatTest.java
...@@ -79,10 +79,7 @@ public class MediaSessionWithMediaControllerCompatTest { ...@@ -79,10 +79,7 @@ public class MediaSessionWithMediaControllerCompatTest {
MediaSession session = MediaSession session =
sessionTestRule.ensureReleaseAfterTest( sessionTestRule.ensureReleaseAfterTest(
new MediaSession.Builder(context, player) new MediaSession.Builder(context, player).setId(TAG).setCallback(callback).build());
.setId(TAG)
.setSessionCallback(callback)
.build());
RemoteMediaControllerCompat controllerCompat = RemoteMediaControllerCompat controllerCompat =
remoteControllerTestRule.createRemoteControllerCompat( remoteControllerTestRule.createRemoteControllerCompat(
session.getSessionCompat().getSessionToken()); session.getSessionCompat().getSessionToken());
......
libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java
...@@ -179,7 +179,7 @@ public class MediaSessionProviderService extends Service { ...@@ -179,7 +179,7 @@ public class MediaSessionProviderService extends Service {
} }
case TEST_CONTROLLER_LISTENER_SESSION_REJECTS: case TEST_CONTROLLER_LISTENER_SESSION_REJECTS:
{ {
builder.setSessionCallback( builder.setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( public MediaSession.ConnectionResult onConnect(
...@@ -194,7 +194,7 @@ public class MediaSessionProviderService extends Service { ...@@ -194,7 +194,7 @@ public class MediaSessionProviderService extends Service {
SessionCommands availableSessionCommands = SessionCommands availableSessionCommands =
SessionCommands.CREATOR.fromBundle( SessionCommands.CREATOR.fromBundle(
tokenExtras.getBundle(KEY_AVAILABLE_SESSION_COMMANDS)); tokenExtras.getBundle(KEY_AVAILABLE_SESSION_COMMANDS));
builder.setSessionCallback( builder.setCallback(
new MediaSession.Callback() { new MediaSession.Callback() {
@Override @Override
public MediaSession.ConnectionResult onConnect( 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 { ...@@ -66,7 +66,7 @@ public class MockMediaSessionService extends MediaSessionService {
session = session =
new MediaSession.Builder(MockMediaSessionService.this, player) new MediaSession.Builder(MockMediaSessionService.this, player)
.setId(ID) .setId(ID)
.setSessionCallback(callback != null ? callback : new TestSessionCallback()) .setCallback(callback != null ? callback : new TestSessionCallback())
.build(); .build();
} }
return session; return session;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment