Skip to content

Commit af1d8b0

Browse files
committed
Remove outdated SDK references
This PR removes references to outdated API in Javadoc/comments, following the min SDK bump to 23.
1 parent ac8d138 commit af1d8b0

File tree

17 files changed

+15
-39
lines changed

17 files changed

+15
-39
lines changed

libraries/common/src/main/java/androidx/media3/common/util/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3719,7 +3719,7 @@ public static long sum(long... summands) {
37193719
* Returns a {@link Drawable} for the given resource or throws a {@link
37203720
* Resources.NotFoundException} if not found.
37213721
*
3722-
* @param context The context to get the theme from starting with API 21.
3722+
* @param context The context to get the theme from.
37233723
* @param resources The resources to load the drawable from.
37243724
* @param drawableRes The drawable resource int.
37253725
* @return The loaded {@link Drawable}.

libraries/datasource/src/androidTest/java/androidx/media3/datasource/MediaDataSourceAdapterContractTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@
2323
import androidx.media3.test.utils.DataSourceContractTest;
2424
import androidx.media3.test.utils.TestUtil;
2525
import androidx.test.ext.junit.runners.AndroidJUnit4;
26-
import androidx.test.filters.SdkSuppress;
2726
import com.google.common.collect.ImmutableList;
2827
import org.junit.Ignore;
2928
import org.junit.Test;
3029
import org.junit.runner.RunWith;
3130

3231
/** {@link DataSource} contract tests for {@link MediaDataSourceAdapter}. */
3332
@RunWith(AndroidJUnit4.class)
34-
@SdkSuppress(minSdkVersion = 23)
3533
public class MediaDataSourceAdapterContractTest extends DataSourceContractTest {
3634

3735
private static final byte[] DATA = TestUtil.buildTestData(20);

libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/ClippedPlaybackTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import androidx.media3.exoplayer.source.DefaultMediaSourceFactory;
3737
import androidx.media3.exoplayer.text.TextOutput;
3838
import androidx.media3.exoplayer.text.TextRenderer;
39-
import androidx.test.filters.SdkSuppress;
4039
import com.google.common.collect.ImmutableList;
4140
import com.google.common.collect.Iterables;
4241
import java.util.ArrayList;
@@ -109,8 +108,6 @@ public void subtitlesRespectClipping_singlePeriod() throws Exception {
109108
}
110109

111110
@Test
112-
// TODO: b/399815346 - This test is flaky on API 21 even when parsing subtitles during extraction.
113-
@SdkSuppress(minSdkVersion = 22)
114111
public void subtitlesRespectClipping_multiplePeriods() throws Exception {
115112
// Parsing subtitles during rendering is flaky (see comment above), so restrict that
116113
// configuration to a single API level to reduce the chance of seeing a flaky failure.

libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/ExoPlayerBinderStressTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import androidx.media3.test.utils.TestUtil;
2828
import androidx.test.core.app.ApplicationProvider;
2929
import androidx.test.ext.junit.runners.AndroidJUnit4;
30-
import androidx.test.filters.SdkSuppress;
3130
import org.junit.Test;
3231
import org.junit.runner.RunWith;
3332

@@ -36,7 +35,6 @@
3635
* verifying that no binder calls happen on the ExoPlayer main thread.
3736
*/
3837
@RunWith(AndroidJUnit4.class)
39-
@SdkSuppress(minSdkVersion = 23)
4038
public class ExoPlayerBinderStressTest {
4139

4240
@Test

libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/MediaExtractorCompatTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,6 @@ public void getPsshInfo_withMediaHavingPsshData_returnsCorrectPsshMap() throws I
11401140
}
11411141

11421142
@Test
1143-
@SdkSuppress(minSdkVersion = 23)
11441143
public void getTrackFormat_withProfileAndLevelInCodecString_returnsExpectedProfileAndLevel()
11451144
throws IOException {
11461145
fakeExtractor.addReadAction(

libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/MediaExtractorContractTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ public void setDataSource_withFileDescriptorOffsetAndLength_returnsCorrectTrackC
155155
}
156156

157157
@Test
158-
@SdkSuppress(minSdkVersion = 23)
159158
public void setDataSource_withMediaDataSource_returnsCorrectTrackCount() throws IOException {
160159
byte[] fileData = TestUtil.getByteArray(context, /* fileName= */ "media/mp4/sample.mp4");
161160
MediaDataSource mediaDataSource =

libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/source/preload/DefaultPreloadManagerBinderStressTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import androidx.media3.test.utils.TestUtil;
3131
import androidx.test.core.app.ApplicationProvider;
3232
import androidx.test.ext.junit.runners.AndroidJUnit4;
33-
import androidx.test.filters.SdkSuppress;
3433
import org.junit.Test;
3534
import org.junit.runner.RunWith;
3635

@@ -40,7 +39,6 @@
4039
* main thread.
4140
*/
4241
@RunWith(AndroidJUnit4.class)
43-
@SdkSuppress(minSdkVersion = 23)
4442
public class DefaultPreloadManagerBinderStressTest {
4543

4644
@Test

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,8 +1453,7 @@ void setMediaSources(
14531453
/**
14541454
* Sets the ID of the audio session to attach to the underlying {@link android.media.AudioTrack}.
14551455
*
1456-
* <p>The audio session ID can be generated using {@link Util#generateAudioSessionIdV21(Context)}
1457-
* for API 21+.
1456+
* <p>The audio session ID can be generated using {@link Util#generateAudioSessionIdV21(Context)}.
14581457
*
14591458
* @param audioSessionId The audio session ID, or {@link C#AUDIO_SESSION_ID_UNSET} if it should be
14601459
* generated by the framework.

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/AudioCapabilities.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ private static boolean isBluetoothConnected(
462462
* AudioDeviceInfo#getType()}.
463463
*
464464
* <p>The types {@link AudioDeviceInfo#TYPE_BLUETOOTH_A2DP} and {@link
465-
* AudioDeviceInfo#TYPE_BLUETOOTH_SCO} are included from API 23. And the types {@link
465+
* AudioDeviceInfo#TYPE_BLUETOOTH_SCO} are included by default. And the types {@link
466466
* AudioDeviceInfo#TYPE_BLE_HEADSET} and {@link AudioDeviceInfo#TYPE_BLE_SPEAKER} are added from
467467
* API 31. And the type {@link AudioDeviceInfo#TYPE_BLE_BROADCAST} is added from API 33.
468468
*/

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,8 +1547,6 @@ protected DecoderReuseEvaluation onInputFormatChanged(FormatHolder formatHolder)
15471547
/**
15481548
* Called immediately before an input buffer is queued into the codec.
15491549
*
1550-
* <p>In tunneling mode for pre Marshmallow, the buffer is treated as if immediately output.
1551-
*
15521550
* @param buffer The buffer to be queued.
15531551
* @throws ExoPlaybackException Thrown if an error occurs handling the input buffer.
15541552
*/

0 commit comments

Comments
 (0)