Commit b8cdd7e4 by olly Committed by Oliver Woodman

Fix lint warnings for 2.10

PiperOrigin-RevId: 244268855
parent b30efe96
......@@ -1089,17 +1089,26 @@ public final class MediaSessionConnector {
}
@Override
public void onSetShuffleMode(int shuffleMode) {
public void onSetShuffleMode(@PlaybackStateCompat.ShuffleMode int shuffleMode) {
if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
boolean shuffleModeEnabled =
shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
|| shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP;
boolean shuffleModeEnabled;
switch (shuffleMode) {
case PlaybackStateCompat.SHUFFLE_MODE_ALL:
case PlaybackStateCompat.SHUFFLE_MODE_GROUP:
shuffleModeEnabled = true;
break;
case PlaybackStateCompat.SHUFFLE_MODE_NONE:
case PlaybackStateCompat.SHUFFLE_MODE_INVALID:
default:
shuffleModeEnabled = false;
break;
}
controlDispatcher.dispatchSetShuffleModeEnabled(player, shuffleModeEnabled);
}
}
@Override
public void onSetRepeatMode(int mediaSessionRepeatMode) {
public void onSetRepeatMode(@PlaybackStateCompat.RepeatMode int mediaSessionRepeatMode) {
if (canDispatchPlaybackAction(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
@RepeatModeUtil.RepeatToggleModes int repeatMode;
switch (mediaSessionRepeatMode) {
......@@ -1110,6 +1119,8 @@ public final class MediaSessionConnector {
case PlaybackStateCompat.REPEAT_MODE_ONE:
repeatMode = Player.REPEAT_MODE_ONE;
break;
case PlaybackStateCompat.REPEAT_MODE_NONE:
case PlaybackStateCompat.REPEAT_MODE_INVALID:
default:
repeatMode = Player.REPEAT_MODE_OFF;
break;
......
......@@ -17,7 +17,6 @@ package com.google.android.exoplayer2;
import androidx.annotation.IntDef;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.util.Assertions;
import java.io.IOException;
......@@ -103,7 +102,6 @@ public final class ExoPlaybackException extends Exception {
* @param cause The cause of the failure.
* @return The created instance.
*/
@VisibleForTesting
public static ExoPlaybackException createForUnexpected(RuntimeException cause) {
return new ExoPlaybackException(TYPE_UNEXPECTED, cause, /* rendererIndex= */ C.INDEX_UNSET);
}
......@@ -124,7 +122,6 @@ public final class ExoPlaybackException extends Exception {
* @param cause The cause of the failure.
* @return The created instance.
*/
@VisibleForTesting
public static ExoPlaybackException createForOutOfMemoryError(OutOfMemoryError cause) {
return new ExoPlaybackException(TYPE_OUT_OF_MEMORY, cause, /* rendererIndex= */ C.INDEX_UNSET);
}
......
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