From 931bc70d5f3e4e616a681323b2b8212e57f15ba4 Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 4 May 2022 10:13:35 +0100 Subject: [PATCH] Migrate usages of the deprecated TrackSelectionParameters.CREATOR PiperOrigin-RevId: 446400192 --- .../media3/demo/main/PlayerActivity.java | 2 +- .../common/TrackSelectionParametersTest.java | 2 +- .../media3/session/MediaSessionStub.java | 2 +- .../androidx/media3/session/PlayerInfo.java | 10 ++++++---- .../session/MediaControllerProviderService.java | 3 +-- .../session/MediaSessionProviderService.java | 17 ++++++++--------- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java index cc031e9467..0bfee73e10 100644 --- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java +++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java @@ -121,7 +121,7 @@ public class PlayerActivity extends AppCompatActivity if (savedInstanceState != null) { trackSelectionParameters = - TrackSelectionParameters.CREATOR.fromBundle( + TrackSelectionParameters.fromBundle( savedInstanceState.getBundle(KEY_TRACK_SELECTION_PARAMETERS)); startAutoPlay = savedInstanceState.getBoolean(KEY_AUTO_PLAY); startItemIndex = savedInstanceState.getInt(KEY_ITEM_INDEX); diff --git a/libraries/common/src/test/java/androidx/media3/common/TrackSelectionParametersTest.java b/libraries/common/src/test/java/androidx/media3/common/TrackSelectionParametersTest.java index c8c16475ee..c26b72a66a 100644 --- a/libraries/common/src/test/java/androidx/media3/common/TrackSelectionParametersTest.java +++ b/libraries/common/src/test/java/androidx/media3/common/TrackSelectionParametersTest.java @@ -201,7 +201,7 @@ public final class TrackSelectionParametersTest { new TrackSelectionParameters.Builder(getApplicationContext()).addOverride(override).build(); TrackSelectionParameters fromBundle = - TrackSelectionParameters.CREATOR.fromBundle(trackSelectionParameters.toBundle()); + TrackSelectionParameters.fromBundle(trackSelectionParameters.toBundle()); assertThat(fromBundle).isEqualTo(trackSelectionParameters); assertThat(trackSelectionParameters.overrides) diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java b/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java index 63f77581b3..cd383d2d63 100644 --- a/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java +++ b/libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java @@ -1492,7 +1492,7 @@ import java.util.concurrent.ExecutionException; TrackSelectionParameters trackSelectionParameters; try { trackSelectionParameters = - TrackSelectionParameters.CREATOR.fromBundle(trackSelectionParametersBundle); + TrackSelectionParameters.fromBundle(trackSelectionParametersBundle); } catch (RuntimeException e) { Log.w(TAG, "Ignoring malformed Bundle for TrackSelectionParameters", e); return; diff --git a/libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java b/libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java index e8375699d8..ea9b7166fe 100644 --- a/libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java +++ b/libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java @@ -890,11 +890,13 @@ import java.util.List; bundle.getLong(keyForField(FIELD_SEEK_FORWARD_INCREMENT_MS), /* defaultValue= */ 0); long maxSeekToPreviousPosition = bundle.getLong(keyForField(FIELD_MAX_SEEK_TO_PREVIOUS_POSITION_MS), /* defaultValue= */ 0); + @Nullable + Bundle trackSelectionParametersBundle = + bundle.getBundle(keyForField(FIELD_TRACK_SELECTION_PARAMETERS)); TrackSelectionParameters trackSelectionParameters = - BundleableUtil.fromNullableBundle( - TrackSelectionParameters.CREATOR, - bundle.getBundle(keyForField(FIELD_TRACK_SELECTION_PARAMETERS)), - TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT); + trackSelectionParametersBundle == null + ? TrackSelectionParameters.DEFAULT_WITHOUT_CONTEXT + : TrackSelectionParameters.fromBundle(trackSelectionParametersBundle); return new PlayerInfo( playerError, mediaItemTransitionReason, diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java index 2229398757..33e2b4fc8c 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaControllerProviderService.java @@ -664,8 +664,7 @@ public class MediaControllerProviderService extends Service { runOnHandler( () -> { MediaController controller = mediaControllerMap.get(controllerId); - controller.setTrackSelectionParameters( - TrackSelectionParameters.CREATOR.fromBundle(parameters)); + controller.setTrackSelectionParameters(TrackSelectionParameters.fromBundle(parameters)); }); } diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java index af569ef51a..e8b5c6dafd 100644 --- a/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java +++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MediaSessionProviderService.java @@ -332,11 +332,12 @@ public class MediaSessionProviderService extends Service { MediaMetadata.CREATOR, config.getBundle(KEY_MEDIA_METADATA), player.mediaMetadata); player.maxSeekToPreviousPositionMs = config.getLong(KEY_MAX_SEEK_TO_PREVIOUS_POSITION_MS, player.maxSeekToPreviousPositionMs); - player.trackSelectionParameters = - BundleableUtil.fromNullableBundle( - TrackSelectionParameters.CREATOR, - config.getBundle(KEY_TRACK_SELECTION_PARAMETERS), - player.trackSelectionParameters); + @Nullable + Bundle trackSelectionParametersBundle = config.getBundle(KEY_TRACK_SELECTION_PARAMETERS); + if (trackSelectionParametersBundle != null) { + player.trackSelectionParameters = + TrackSelectionParameters.fromBundle(trackSelectionParametersBundle); + } return player; } @@ -770,8 +771,7 @@ public class MediaSessionProviderService extends Service { () -> { MediaSession session = sessionMap.get(sessionId); MockPlayer player = (MockPlayer) session.getPlayer(); - player.trackSelectionParameters = - TrackSelectionParameters.CREATOR.fromBundle(parameters); + player.trackSelectionParameters = TrackSelectionParameters.fromBundle(parameters); }); } @@ -951,8 +951,7 @@ public class MediaSessionProviderService extends Service { @Override public void notifyTrackSelectionParametersChanged(String sessionId, Bundle parametersBundle) throws RemoteException { - TrackSelectionParameters parameters = - TrackSelectionParameters.CREATOR.fromBundle(parametersBundle); + TrackSelectionParameters parameters = TrackSelectionParameters.fromBundle(parametersBundle); runOnHandler( () -> { MediaSession session = sessionMap.get(sessionId);