diff --git a/libraries/exoplayer/build.gradle b/libraries/exoplayer/build.gradle index fecd9bcbf9..da7417cfd3 100644 --- a/libraries/exoplayer/build.gradle +++ b/libraries/exoplayer/build.gradle @@ -34,6 +34,12 @@ android { test.assets.srcDir '../test_data/src/test/assets/' } + lintOptions { + // TODO: b/353490583 - Move this to common_library_config.gradle once it's enabled for all + // libraries. + checkTestSources true + } + publishing { singleVariant('release') { withSourcesJar() diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java index 8997efda66..e3612d6a22 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioSink.java @@ -160,7 +160,7 @@ public interface AudioSink { /** Configuration parameters used for an {@link AudioTrack}. */ final class AudioTrackConfig { - /* The {@link C.Encoding} of the audio data. */ + /** The {@link C.Encoding} of the audio data. */ public final @C.Encoding int encoding; /** The sample rate of the audio data. */ diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/spherical/ProjectionDecoder.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/spherical/ProjectionDecoder.java index 4b0acba57b..cf9dc1a18f 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/spherical/ProjectionDecoder.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/spherical/ProjectionDecoder.java @@ -51,7 +51,7 @@ import java.util.zip.Inflater; private ProjectionDecoder() {} - /* + /** * Decodes the projection data. * * @param projectionData The projection data. diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaExtractorCompatTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaExtractorCompatTest.java index 2a2939fddd..00f14da41d 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaExtractorCompatTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/MediaExtractorCompatTest.java @@ -792,7 +792,7 @@ public class MediaExtractorCompatTest { @Override public int read(ExtractorInput input, PositionHolder seekPosition) throws IOException { if (nextReadActionIndex >= readActions.size()) { - return C.RESULT_END_OF_INPUT; + return Extractor.RESULT_END_OF_INPUT; } else { return readActions.get(nextReadActionIndex++).apply(input, seekPosition); } diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/DefaultAudioSinkTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/DefaultAudioSinkTest.java index 079e518dc4..82013a851f 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/DefaultAudioSinkTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/audio/DefaultAudioSinkTest.java @@ -346,6 +346,8 @@ public final class DefaultAudioSinkTest { new DefaultAudioSink.Builder() .setAudioCapabilities(new AudioCapabilities(new int[] {C.ENCODING_AAC_LC}, 2)) .build(); + // TODO: b/376880213 - Resolve this lint error. + @SuppressWarnings("WrongConstant") Format aacLcFormat = STEREO_44_1_FORMAT .buildUpon() diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecCallbackTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecCallbackTest.java index a16830baae..d15deea0a9 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecCallbackTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/mediacodec/AsynchronousMediaCodecCallbackTest.java @@ -207,7 +207,7 @@ public class AsynchronousMediaCodecCallbackTest { MediaCodec.BufferInfo bufferInfo1 = new MediaCodec.BufferInfo(); asynchronousMediaCodecCallback.onOutputBufferAvailable(codec, 0, bufferInfo1); MediaCodec.BufferInfo bufferInfo2 = new MediaCodec.BufferInfo(); - bufferInfo2.set(1, 1, 1, 1); + bufferInfo2.set(1, 1, 1, MediaCodec.BUFFER_FLAG_KEY_FRAME); asynchronousMediaCodecCallback.onOutputBufferAvailable(codec, 1, bufferInfo2); MediaCodec.BufferInfo outBufferInfo = new MediaCodec.BufferInfo(); diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SilenceMediaSourceTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SilenceMediaSourceTest.java index 6618e1c473..002289ad8b 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SilenceMediaSourceTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/source/SilenceMediaSourceTest.java @@ -74,6 +74,7 @@ public class SilenceMediaSourceTest { @Test public void builderSetDurationUs_nonPositiveValue_throwsIllegalStateException() { + @SuppressWarnings("Range") // Deliberately testing an invalid value SilenceMediaSource.Factory factory = new SilenceMediaSource.Factory().setDurationUs(-1); assertThrows(IllegalStateException.class, factory::createMediaSource); diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java index c743410de3..c451520513 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java @@ -2777,6 +2777,7 @@ public final class DefaultTrackSelectorTest { .build()) .build()); // Offload playback with gapless transitions is supported + @SuppressWarnings("WrongConstant") // Combining these two values bit-wise is allowed RendererCapabilities capabilitiesOffloadSupport = new FakeRendererCapabilities( C.TRACK_TYPE_AUDIO, diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java index 9ad273c6aa..073a06bd2d 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/DefaultBandwidthMeterTest.java @@ -732,7 +732,8 @@ public final class DefaultBandwidthMeterTest { setActiveNetworkInfo(networkInfo, TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE); } - @SuppressWarnings("StickyBroadcast") + // Adding the permission to the test AndroidManifest.xml doesn't work to appease lint. + @SuppressWarnings({"StickyBroadcast", "MissingPermission"}) private void setActiveNetworkInfo(NetworkInfo networkInfo, int networkTypeOverride) { // Set network info in ConnectivityManager and TelephonyDisplayInfo in TelephonyManager. Shadows.shadowOf(connectivityManager).setActiveNetworkInfo(networkInfo); diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/experimental/ExperimentalBandwidthMeterTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/experimental/ExperimentalBandwidthMeterTest.java index e00382dc1c..a4ee300f35 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/experimental/ExperimentalBandwidthMeterTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/upstream/experimental/ExperimentalBandwidthMeterTest.java @@ -742,7 +742,8 @@ public final class ExperimentalBandwidthMeterTest { setActiveNetworkInfo(networkInfo, TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE); } - @SuppressWarnings("StickyBroadcast") + // Adding the permission to the test AndroidManifest.xml doesn't work to appease lint. + @SuppressWarnings({"StickyBroadcast", "MissingPermission"}) private void setActiveNetworkInfo(NetworkInfo networkInfo, int networkTypeOverride) { // Set network info in ConnectivityManager and TelephonyDisplayInfo in TelephonyManager. Shadows.shadowOf(connectivityManager).setActiveNetworkInfo(networkInfo);