From 30f95cdcac926313cb6840182d596b86cc7f3a03 Mon Sep 17 00:00:00 2001 From: hdmoon Date: Fri, 27 Oct 2017 01:34:58 -0700 Subject: [PATCH] Remove shuffleMode(boolean) usages in ExoPlayer ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=173645536 --- .../ext/mediasession/DefaultPlaybackController.java | 2 +- .../exoplayer2/ext/mediasession/MediaSessionConnector.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java index dcb6f8ca10..1eb3ffd13d 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/DefaultPlaybackController.java @@ -40,7 +40,7 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback private static final long BASE_ACTIONS = PlaybackStateCompat.ACTION_PLAY_PAUSE | PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE - | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED + | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE | PlaybackStateCompat.ACTION_SET_REPEAT_MODE; protected final long rewindIncrementMs; diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java index 2781c020d0..aa007ea1d6 100644 --- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java +++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java @@ -152,7 +152,7 @@ public final class MediaSessionConnector { | PlaybackStateCompat.ACTION_PAUSE | PlaybackStateCompat.ACTION_SEEK_TO | PlaybackStateCompat.ACTION_FAST_FORWARD | PlaybackStateCompat.ACTION_REWIND | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_REPEAT_MODE - | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED; + | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE; /** * Returns the actions which are supported by the controller. The supported actions must be a @@ -161,7 +161,7 @@ public final class MediaSessionConnector { * {@link PlaybackStateCompat#ACTION_SEEK_TO}, {@link PlaybackStateCompat#ACTION_FAST_FORWARD}, * {@link PlaybackStateCompat#ACTION_REWIND}, {@link PlaybackStateCompat#ACTION_STOP}, * {@link PlaybackStateCompat#ACTION_SET_REPEAT_MODE} and - * {@link PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE_ENABLED}. + * {@link PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE}. * * @param player The player. * @return The bitmask of the supported media actions. @@ -738,7 +738,7 @@ public final class MediaSessionConnector { @Override public void onSetShuffleMode(int shuffleMode) { - if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) { + if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) { playbackController.onSetShuffleMode(player, shuffleMode); } }