loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove nullness warnings in session module

Browse Source 
PiperOrigin-RevId: 527666416
This commit is contained in:
bachinger 2023-04-27 21:24:33 +01:00 committed by Marc Baechinger
parent 5c02210305
commit 9b3a5df5ef
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/session/src/main/java/androidx/media3/session/MediaUtils.java
View File

@ -814,8 +814,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
}
/** Converts a {@link PlaybackStateCompat} to {@link Player.State} */
@Player.State
public static int convertToPlaybackState(
public static @Player.State int convertToPlaybackState(
@Nullable PlaybackStateCompat playbackStateCompat,
@Nullable MediaMetadataCompat currentMediaMetadata,
long timeDiffMs) {
@ -960,8 +959,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
}
/** Converts {@link PlaybackStateCompat.RepeatMode} to {@link Player.RepeatMode}. */
@Player.RepeatMode
public static int convertToRepeatMode(
public static @Player.RepeatMode int convertToRepeatMode(
@PlaybackStateCompat.RepeatMode int playbackStateCompatRepeatMode) {
switch (playbackStateCompatRepeatMode) {
case PlaybackStateCompat.REPEAT_MODE_INVALID:

22
libraries/session/src/main/java/androidx/media3/session/PlayerInfo.java
View File

@ -119,13 +119,13 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
public static class Builder {
@Nullable private PlaybackException playerError;
@Player.MediaItemTransitionReason private int mediaItemTransitionReason;
private @Player.MediaItemTransitionReason int mediaItemTransitionReason;
private SessionPositionInfo sessionPositionInfo;
private PositionInfo oldPositionInfo;
private PositionInfo newPositionInfo;
@Player.DiscontinuityReason private int discontinuityReason;
private @Player.DiscontinuityReason int discontinuityReason;
private PlaybackParameters playbackParameters;
@Player.RepeatMode private int repeatMode;
private @Player.RepeatMode int repeatMode;
private boolean shuffleModeEnabled;
private Timeline timeline;
private VideoSize videoSize;
@ -137,11 +137,11 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
private int deviceVolume;
private boolean deviceMuted;
private boolean playWhenReady;
@Player.PlayWhenReadyChangeReason private int playWhenReadyChangedReason;
private @Player.PlayWhenReadyChangeReason int playWhenReadyChangedReason;
private boolean isPlaying;
private boolean isLoading;
@PlaybackSuppressionReason private int playbackSuppressionReason;
@State private int playbackState;
private @PlaybackSuppressionReason int playbackSuppressionReason;
private @State int playbackState;
private MediaMetadata mediaMetadata;
private long seekBackIncrementMs;
private long seekForwardIncrementMs;
@ -449,7 +449,7 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
@Nullable public final PlaybackException playerError;
@Player.MediaItemTransitionReason public final int mediaItemTransitionReason;
public final @Player.MediaItemTransitionReason int mediaItemTransitionReason;
public final SessionPositionInfo sessionPositionInfo;
@ -457,11 +457,11 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
public final PositionInfo newPositionInfo;
@Player.DiscontinuityReason public final int discontinuityReason;
public final @Player.DiscontinuityReason int discontinuityReason;
public final PlaybackParameters playbackParameters;
@Player.RepeatMode public final int repeatMode;
public final @Player.RepeatMode int repeatMode;
public final boolean shuffleModeEnabled;
@ -491,9 +491,9 @@ import com.google.errorprone.annotations.CanIgnoreReturnValue;
public final boolean isLoading;
@Player.PlaybackSuppressionReason public final int playbackSuppressionReason;
public final @Player.PlaybackSuppressionReason int playbackSuppressionReason;
@Player.State public final int playbackState;
public final @Player.State int playbackState;
public final MediaMetadata mediaMetadata;

2
libraries/session/src/main/java/androidx/media3/session/SessionTokenImplBase.java
View File

@ -32,7 +32,7 @@ import com.google.common.base.Objects;
private final int uid;
@SessionToken.TokenType private final int type;
private final @SessionToken.TokenType int type;
private final int libraryVersion;