From 1440cad5ed60cdb2d739bfff6622768ce7e7585f Mon Sep 17 00:00:00 2001 From: olly Date: Wed, 12 Feb 2020 01:09:04 +0000 Subject: [PATCH] Fix build warnings under exoplayer/v2/library - Removes empty

tag in javadoc - Removes incorrect parameter name warnings for var args. PiperOrigin-RevId: 294555651 --- .../com/google/android/exoplayer2/ExoPlayerTest.java | 2 +- .../analytics/DefaultPlaybackSessionManagerTest.java | 10 +++++----- .../source/ConcatenatingMediaSourceTest.java | 6 +++--- .../trackselection/AdaptiveTrackSelectionTest.java | 2 +- .../trackselection/DefaultTrackSelectorTest.java | 4 ++-- .../google/android/exoplayer2/ui/DefaultTimeBar.java | 2 -- .../android/exoplayer2/ui/PlayerControlView.java | 2 -- .../com/google/android/exoplayer2/ui/PlayerView.java | 2 -- 8 files changed, 12 insertions(+), 18 deletions(-) diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java index 602cff4391..927c51b468 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java @@ -459,7 +459,7 @@ public final class ExoPlayerTest { public void testAdGroupWithLoadErrorIsSkipped() throws Exception { AdPlaybackState initialAdPlaybackState = FakeTimeline.createAdPlaybackState( - /* adsPerAdGroup= */ 1, /* adGroupTimesUs= */ 5 * C.MICROS_PER_SECOND); + /* adsPerAdGroup= */ 1, /* adGroupTimesUs=... */ 5 * C.MICROS_PER_SECOND); Timeline fakeTimeline = new FakeTimeline( new TimelineWindowDefinition( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java index 00e93c0782..d0a9a496f1 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/analytics/DefaultPlaybackSessionManagerTest.java @@ -609,7 +609,7 @@ public final class DefaultPlaybackSessionManagerTest { /* isSeekable= */ true, /* isDynamic= */ false, /* durationUs =*/ 10 * C.MICROS_PER_SECOND, - new AdPlaybackState(/* adGroupTimesUs= */ C.TIME_END_OF_SOURCE) + new AdPlaybackState(/* adGroupTimesUs=... */ C.TIME_END_OF_SOURCE) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1))); EventTime adEventTime = createEventTime( @@ -820,7 +820,7 @@ public final class DefaultPlaybackSessionManagerTest { /* isSeekable= */ true, /* isDynamic= */ false, /* durationUs =*/ 10 * C.MICROS_PER_SECOND, - new AdPlaybackState(/* adGroupTimesUs= */ 0, 5 * C.MICROS_PER_SECOND) + new AdPlaybackState(/* adGroupTimesUs=... */ 0, 5 * C.MICROS_PER_SECOND) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); EventTime adEventTime1 = @@ -881,7 +881,7 @@ public final class DefaultPlaybackSessionManagerTest { /* isDynamic= */ false, /* durationUs =*/ 10 * C.MICROS_PER_SECOND, new AdPlaybackState( - /* adGroupTimesUs= */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND) + /* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); EventTime adEventTime1 = @@ -932,7 +932,7 @@ public final class DefaultPlaybackSessionManagerTest { /* isSeekable= */ true, /* isDynamic= */ false, /* durationUs =*/ 10 * C.MICROS_PER_SECOND, - new AdPlaybackState(/* adGroupTimesUs= */ 0, 5 * C.MICROS_PER_SECOND) + new AdPlaybackState(/* adGroupTimesUs=... */ 0, 5 * C.MICROS_PER_SECOND) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); EventTime adEventTime1 = @@ -1004,7 +1004,7 @@ public final class DefaultPlaybackSessionManagerTest { /* isDynamic= */ false, /* durationUs =*/ 10 * C.MICROS_PER_SECOND, new AdPlaybackState( - /* adGroupTimesUs= */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND) + /* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND, 5 * C.MICROS_PER_SECOND) .withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1) .withAdCount(/* adGroupIndex= */ 1, /* adCount= */ 1))); EventTime adEventTime1 = diff --git a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java index 40360fd897..8969f2b22f 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java @@ -666,7 +666,7 @@ public final class ConcatenatingMediaSourceTest { false, 10 * C.MICROS_PER_SECOND, FakeTimeline.createAdPlaybackState( - /* adsPerAdGroup= */ 1, /* adGroupTimesUs= */ 0))); + /* adsPerAdGroup= */ 1, /* adGroupTimesUs=... */ 0))); FakeMediaSource mediaSourceContentOnly = new FakeMediaSource(timelineContentOnly); FakeMediaSource mediaSourceWithAds = new FakeMediaSource(timelineWithAds); mediaSource.addMediaSource(mediaSourceContentOnly); @@ -837,7 +837,7 @@ public final class ConcatenatingMediaSourceTest { new MediaPeriodId(childPeriodUid1, /* windowSequenceNumber= */ 5), new MediaPeriodId(childPeriodUid1, /* windowSequenceNumber= */ 7)); // Assert that only one manifest load is reported because the source is reused. - testRunner.assertCompletedManifestLoads(/* windowIndices= */ 0); + testRunner.assertCompletedManifestLoads(/* windowIndices=... */ 0); assertCompletedAllMediaPeriodLoads(timeline); testRunner.releaseSource(); @@ -870,7 +870,7 @@ public final class ConcatenatingMediaSourceTest { new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 3), new MediaPeriodId(childPeriodUid, /* windowSequenceNumber= */ 4)); // Assert that only one manifest load is needed because the source is reused. - testRunner.assertCompletedManifestLoads(/* windowIndices= */ 0); + testRunner.assertCompletedManifestLoads(/* windowIndices=... */ 0); assertCompletedAllMediaPeriodLoads(timeline); testRunner.releaseSource(); diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java index af935048e8..4fb00f93f6 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/AdaptiveTrackSelectionTest.java @@ -72,7 +72,7 @@ public final class AdaptiveTrackSelectionTest { new AdaptiveTrackSelection.Factory(initialBandwidthMeter) .createTrackSelections( new Definition[] { - new Definition(new TrackGroup(format1, format2), /* tracks= */ 0, 1) + new Definition(new TrackGroup(format1, format2), /* tracks=... */ 0, 1) }, injectedBandwidthMeter); trackSelections[0].updateSelectedTrack( diff --git a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java index 6cd56924ef..035470cf20 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java @@ -1455,7 +1455,7 @@ public final class DefaultTrackSelectorTest { .setSelectionOverride( /* rendererIndex= */ 0, trackGroups, - new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2))); + new SelectionOverride(/* groupIndex= */ 0, /* tracks=... */ 1, 2))); TrackSelectorResult result = trackSelector.selectTracks( new RendererCapabilities[] {AUDIO_CAPABILITIES}, trackGroups, periodId, TIMELINE); @@ -1593,7 +1593,7 @@ public final class DefaultTrackSelectorTest { .setSelectionOverride( /* rendererIndex= */ 0, trackGroups, - new SelectionOverride(/* groupIndex= */ 0, /* tracks= */ 1, 2))); + new SelectionOverride(/* groupIndex= */ 0, /* tracks=... */ 1, 2))); TrackSelectorResult result = trackSelector.selectTracks( new RendererCapabilities[] {VIDEO_CAPABILITIES}, trackGroups, periodId, TIMELINE); diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java index fb930f8dd5..15799db2c6 100644 --- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java +++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/DefaultTimeBar.java @@ -55,8 +55,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; * * The following attributes can be set on a DefaultTimeBar when used in a layout XML file: * - *

- * *