Skip to content

Commit aedd757

Browse files
committed
Bug fix: ensure platform session is in a consistent state before updating media3 controllers
1 parent aec3167 commit aedd757

File tree

4 files changed

+336
-220
lines changed

4 files changed

+336
-220
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import android.app.PendingIntent;
2828
import android.content.Context;
2929
import android.os.Bundle;
30-
import android.os.RemoteException;
3130
import androidx.annotation.Nullable;
3231
import androidx.media3.common.MediaItem;
3332
import androidx.media3.common.MediaMetadata;
@@ -359,19 +358,6 @@ protected MediaSessionServiceLegacyStub createLegacyBrowserService(
359358
return stub;
360359
}
361360

362-
@Override
363-
protected void dispatchRemoteControllerTaskWithoutReturn(RemoteControllerTask task) {
364-
super.dispatchRemoteControllerTaskWithoutReturn(task);
365-
@Nullable MediaLibraryServiceLegacyStub legacyStub = getLegacyBrowserService();
366-
if (legacyStub != null) {
367-
try {
368-
task.run(legacyStub.getBrowserLegacyCbForBroadcast(), /* seq= */ 0);
369-
} catch (RemoteException e) {
370-
Log.e(TAG, "Exception in using media1 API", e);
371-
}
372-
}
373-
}
374-
375361
private void maybeUpdateLegacyErrorState(ControllerInfo browser, LibraryResult<?> result) {
376362
if (libraryErrorReplicationMode == MediaLibrarySession.LIBRARY_ERROR_REPLICATION_MODE_NONE
377363
|| browser.getControllerVersion() != ControllerInfo.LEGACY_CONTROLLER_VERSION) {

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,6 @@
5151
import androidx.media3.common.Player.RepeatMode;
5252
import androidx.media3.common.Rating;
5353
import androidx.media3.common.Timeline;
54-
import androidx.media3.common.TrackSelectionParameters;
55-
import androidx.media3.common.Tracks;
5654
import androidx.media3.common.VideoSize;
5755
import androidx.media3.common.util.BitmapLoader;
5856
import androidx.media3.common.util.UnstableApi;
@@ -2319,11 +2317,6 @@ default void onIsPlayingChanged(int seq, boolean isPlaying) throws RemoteExcepti
23192317

23202318
default void onIsLoadingChanged(int seq, boolean isLoading) throws RemoteException {}
23212319

2322-
default void onTracksChanged(int seq, Tracks tracks) throws RemoteException {}
2323-
2324-
default void onTrackSelectionParametersChanged(int seq, TrackSelectionParameters parameters)
2325-
throws RemoteException {}
2326-
23272320
default void onPlaybackParametersChanged(int seq, PlaybackParameters playbackParameters)
23282321
throws RemoteException {}
23292322

0 commit comments

Comments
 (0)