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

Remove IfAny suffix from @Nullable IntDef locals in MCImplBase

Browse Source 
We use `@Nullable` for IntDefs in other places and don't use this suffix
elsewhere, so I don't think we need it here either.

PiperOrigin-RevId: 543687285
This commit is contained in:
ibaker 2023-06-27 09:54:48 +00:00 committed by Tianyi Feng
parent f8491fc61f
commit dc311fd0ca
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/session/src/main/java/androidx/media3/session/MediaControllerImplBase.java
View File

@ -2581,7 +2581,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
@Nullable @Nullable
@Player.DiscontinuityReason @Player.DiscontinuityReason
Integer positionDiscontinuityReasonIfAny = Integer positionDiscontinuityReason =
(!oldPlayerInfo.oldPositionInfo.equals(newPlayerInfo.oldPositionInfo) (!oldPlayerInfo.oldPositionInfo.equals(newPlayerInfo.oldPositionInfo)
|| !oldPlayerInfo.newPositionInfo.equals(newPlayerInfo.newPositionInfo)) || !oldPlayerInfo.newPositionInfo.equals(newPlayerInfo.newPositionInfo))
? finalPlayerInfo.discontinuityReason ? finalPlayerInfo.discontinuityReason
@ -2589,21 +2589,21 @@ import org.checkerframework.checker.nullness.qual.NonNull;
@Nullable @Nullable
@Player.MediaItemTransitionReason @Player.MediaItemTransitionReason
Integer mediaItemTransitionReasonIfAny = Integer mediaItemTransitionReason =
!Util.areEqual(oldPlayerInfo.getCurrentMediaItem(), finalPlayerInfo.getCurrentMediaItem()) !Util.areEqual(oldPlayerInfo.getCurrentMediaItem(), finalPlayerInfo.getCurrentMediaItem())
? finalPlayerInfo.mediaItemTransitionReason ? finalPlayerInfo.mediaItemTransitionReason
: null; : null;
@Nullable @Nullable
@Player.TimelineChangeReason @Player.TimelineChangeReason
Integer timelineChangeReasonIfAny = Integer timelineChangeReason =
!oldPlayerInfo.timeline.equals(finalPlayerInfo.timeline) !oldPlayerInfo.timeline.equals(finalPlayerInfo.timeline)
? finalPlayerInfo.timelineChangeReason ? finalPlayerInfo.timelineChangeReason
: null; : null;
@Nullable @Nullable
@Player.PlayWhenReadyChangeReason @Player.PlayWhenReadyChangeReason
Integer playWhenReadyChangeReasonIfAny = Integer playWhenReadyChangeReason =
oldPlayerInfo.playWhenReady != finalPlayerInfo.playWhenReady oldPlayerInfo.playWhenReady != finalPlayerInfo.playWhenReady
? finalPlayerInfo.playWhenReadyChangeReason ? finalPlayerInfo.playWhenReadyChangeReason
: null; : null;
@ -2611,10 +2611,10 @@ import org.checkerframework.checker.nullness.qual.NonNull;
notifyPlayerInfoListenersWithReasons( notifyPlayerInfoListenersWithReasons(
oldPlayerInfo, oldPlayerInfo,
finalPlayerInfo, finalPlayerInfo,
timelineChangeReasonIfAny, timelineChangeReason,
playWhenReadyChangeReasonIfAny, playWhenReadyChangeReason,
positionDiscontinuityReasonIfAny, positionDiscontinuityReason,
mediaItemTransitionReasonIfAny); mediaItemTransitionReason);
} }
void onAvailableCommandsChangedFromSession( void onAvailableCommandsChangedFromSession(