Skip to content

Commit

Permalink
Fix 19 ErrorProneStyle findings:
Browse files Browse the repository at this point in the history 
* Non-standard parameter comment; prefer `/* paramName= */ arg`
  (see http://go/bugpattern/ParameterComment) (19 times)

This CL looks good? Just LGTM and Approve it!
This CL doesn’t look good? This is what you can do:
* Revert this CL, by replying "REVERT: <provide reason>"
* File a bug under go/error-prone-bug for category ErrorProneStyle if there's an issue with the CL content.
* File a bug under go/rosie-bug if there's an issue with how the CL was managed.
* Revert this CL and not get a CL that cleans up these paths in the future by
replying "BLOCKLIST: <provide reason>". This is not reversible! We recommend to
opt out the respective paths in your CL Robot configuration instead:
go/clrobot-opt-out.

This CL was generated by CL Robot - a tool that cleans up code findings
(go/clrobot). The affected code paths have been enabled for CL Robot in //depot/google3/java/com/google/android/libraries/media/METADATA which is reachable following include_presubmits from //depot/google3/third_party/java_src/android_libs/media/METADATA.
Anything wrong with the signup? File a bug at go/clrobot-bug.

#codehealth

Tested:
    Local presubmit tests passed.
PiperOrigin-RevId: 471022923
  • Loading branch information
@marcbaechinger
Googler authored and marcbaechinger committed Oct 19, 2022
1 parent 9f67ce4 commit 674b3d4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
34 changes: 17 additions & 17 deletions library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1222,10 +1222,10 @@ public void dynamicTimelineChangeReason() throws Exception {
new ActionSchedule.Builder(TAG)
.pause()
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.executeRunnable(() -> mediaSource.setNewSourceInfo(timeline2))
.waitForTimelineChanged(
timeline2, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline2, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.play()
.build();
ExoPlayerTestRunner testRunner =
Expand Down Expand Up @@ -1748,7 +1748,7 @@ public void resetPlaylistWithPreviousPosition() throws Exception {
.playUntilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 2000)
.setMediaSources(/* mediaItemIndex= */ 0, /* positionMs= */ 2000, secondSource)
.waitForTimelineChanged(
secondTimeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
secondTimeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.executeRunnable(
new PlayerRunnable() {
@Override
Expand Down Expand Up @@ -1802,7 +1802,7 @@ public void resetPlaylistStartsFromDefaultPosition() throws Exception {
.playUntilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 2000)
.setMediaSources(/* resetPosition= */ true, secondSource)
.waitForTimelineChanged(
secondTimeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
secondTimeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.executeRunnable(
new PlayerRunnable() {
@Override
Expand Down Expand Up @@ -1859,7 +1859,7 @@ public void resetPlaylistWithoutResettingPositionStartsFromOldPosition() throws
.playUntilPosition(/* mediaItemIndex= */ 0, /* positionMs= */ 2000)
.setMediaSources(secondSource)
.waitForTimelineChanged(
secondTimeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
secondTimeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.executeRunnable(
new PlayerRunnable() {
@Override
Expand Down Expand Up @@ -2296,7 +2296,7 @@ public void sendMessagesAfterPreparation() throws Exception {
new ActionSchedule.Builder(TAG)
.pause()
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.sendMessage(target, /* positionMs= */ 50)
.play()
.build();
Expand Down Expand Up @@ -2485,7 +2485,7 @@ public void sendMessagesSeekOnDeliveryTimeAfterPreparation() throws Exception {
.waitForPlaybackState(Player.STATE_BUFFERING)
.sendMessage(target, /* positionMs= */ 50)
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.seek(/* positionMs= */ 50)
.build();
new ExoPlayerTestRunner.Builder(context)
Expand Down Expand Up @@ -2525,7 +2525,7 @@ public void sendMessagesSeekAfterDeliveryTimeAfterPreparation() throws Exception
.pause()
.sendMessage(target, /* positionMs= */ 50)
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.seek(/* positionMs= */ 51)
.play()
.build();
Expand Down Expand Up @@ -2602,11 +2602,11 @@ public void sendMessagesMoveCurrentMediaItemIndex() throws Exception {
new ActionSchedule.Builder(TAG)
.pause()
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.sendMessage(target, /* positionMs= */ 50)
.executeRunnable(() -> mediaSource.setNewSourceInfo(secondTimeline))
.waitForTimelineChanged(
secondTimeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
secondTimeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.play()
.build();
new ExoPlayerTestRunner.Builder(context)
Expand Down Expand Up @@ -2648,7 +2648,7 @@ public void sendMessagesMultiWindowAfterPreparation() throws Exception {
new ActionSchedule.Builder(TAG)
.pause()
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.sendMessage(target, /* mediaItemIndex = */ 2, /* positionMs= */ 50)
.play()
.build();
Expand Down Expand Up @@ -2679,11 +2679,11 @@ public void sendMessagesMoveMediaItemIndex() throws Exception {
new ActionSchedule.Builder(TAG)
.pause()
.waitForTimelineChanged(
timeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.sendMessage(target, /* mediaItemIndex = */ 1, /* positionMs= */ 50)
.executeRunnable(() -> mediaSource.setNewSourceInfo(secondTimeline))
.waitForTimelineChanged(
secondTimeline, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
secondTimeline, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.seek(/* mediaItemIndex= */ 0, /* positionMs= */ 0)
.play()
.build();
Expand Down Expand Up @@ -2893,7 +2893,7 @@ public void timelineUpdateDropsPrebufferedPeriods() throws Exception {
/* positionMs= */ Util.usToMs(TimelineWindowDefinition.DEFAULT_WINDOW_DURATION_US))
.executeRunnable(() -> mediaSource.setNewSourceInfo(timeline2))
.waitForTimelineChanged(
timeline2, /* expectedReason */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
timeline2, /* expectedReason= */ Player.TIMELINE_CHANGE_REASON_SOURCE_UPDATE)
.play()
.build();
ExoPlayerTestRunner testRunner =
Expand Down Expand Up @@ -9368,7 +9368,7 @@ public void removeMediaItem_atTheEnd_notifiesAvailableCommandsChanged() {
Player.Commands defaultCommands = createWithDefaultCommands();
Player.Commands commandsWithSeekToNextWindow =
createWithDefaultCommands(COMMAND_SEEK_TO_NEXT_MEDIA_ITEM, COMMAND_SEEK_TO_NEXT);
Player.Commands emptyTimelineCommands = createWithDefaultCommands(/* isTimelineEmpty */ true);
Player.Commands emptyTimelineCommands = createWithDefaultCommands(/* isTimelineEmpty= */ true);
Player.Listener mockListener = mock(Player.Listener.class);
ExoPlayer player = new TestExoPlayerBuilder(context).build();
player.addListener(mockListener);
Expand Down Expand Up @@ -9396,7 +9396,7 @@ public void removeMediaItem_atTheStart_notifiesAvailableCommandsChanged() {
Player.Commands defaultCommands = createWithDefaultCommands();
Player.Commands commandsWithSeekToPreviousWindow =
createWithDefaultCommands(COMMAND_SEEK_TO_PREVIOUS_MEDIA_ITEM);
Player.Commands emptyTimelineCommands = createWithDefaultCommands(/* isTimelineEmpty */ true);
Player.Commands emptyTimelineCommands = createWithDefaultCommands(/* isTimelineEmpty= */ true);
Player.Listener mockListener = mock(Player.Listener.class);
ExoPlayer player = new TestExoPlayerBuilder(context).build();
player.addListener(mockListener);
Expand Down Expand Up @@ -10089,7 +10089,7 @@ public void targetLiveOffsetInMedia_withSetPlaybackParameters_usesPlaybackParame
// Verify test setup (now = 20 seconds in live window, default start position = 20 seconds).
assertThat(liveOffsetAtStart).isIn(Range.closed(-100L, 100L));

player.setPlaybackParameters(new PlaybackParameters(/* speed */ 2.0f));
player.setPlaybackParameters(new PlaybackParameters(/* speed= */ 2.0f));
// Play until close to the end of the available live window.
TestPlayerRunHelper.playUntilPosition(
player, /* mediaItemIndex= */ 0, /* positionMs= */ 999_000);
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/test/java/com/google/android/exoplayer2/MediaPeriodQueueTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ private void setupTimeline(Timeline timeline) {
mediaSourceList.setMediaSources(
ImmutableList.of(mediaSourceHolder), new FakeShuffleOrder(/* length= */ 1));
mediaSourceHolder.mediaSource.prepareSource(
mock(MediaSourceCaller.class), /* mediaTransferListener */ null, PlayerId.UNSET);
mock(MediaSourceCaller.class), /* mediaTransferListener= */ null, PlayerId.UNSET);

Timeline playlistTimeline = mediaSourceList.createTimeline();
firstPeriodUid = playlistTimeline.getUidOfPeriod(/* periodIndex= */ 0);
Expand Down
2 changes: 1 addition & 1 deletion library/core/src/test/java/com/google/android/exoplayer2/MediaSourceListTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ public void removeMediaSources_whenPrepared_expectRelease() {
mockMediaSource2,
mockMediaSource3,
mockMediaSource4);
mediaSourceList.prepare(/* mediaTransferListener */ null);
mediaSourceList.prepare(/* mediaTransferListener= */ null);
mediaSourceList.addMediaSources(/* index= */ 0, holders, shuffleOrder);
mediaSourceList.removeMediaSourceRange(/* fromIndex= */ 1, /* toIndex= */ 3, shuffleOrder);

Expand Down

0 comments on commit 674b3d4

Please sign in to comment.