diff --git a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/DataSourceBitmapLoaderTest.java b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/DataSourceBitmapLoaderTest.java index 6c0e80813b..2c978e856e 100644 --- a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/DataSourceBitmapLoaderTest.java +++ b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/DataSourceBitmapLoaderTest.java @@ -27,6 +27,7 @@ import androidx.media3.common.ParserException; import androidx.media3.test.utils.TestUtil; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SdkSuppress; import com.google.common.io.Files; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; @@ -48,6 +49,7 @@ import org.junit.runner.RunWith; *

This test needs to run as an androidTest because robolectric's BitmapFactory is not fully * functional. */ +@SdkSuppress(minSdkVersion = 22) // This test OOMs on the API 21 emulator used in CI. @RunWith(AndroidJUnit4.class) public class DataSourceBitmapLoaderTest { diff --git a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/FileDescriptorDataSourceUsingAssetFileDescriptorContractTest.java b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/FileDescriptorDataSourceUsingAssetFileDescriptorContractTest.java index 217065dffc..ffd9bccac4 100644 --- a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/FileDescriptorDataSourceUsingAssetFileDescriptorContractTest.java +++ b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/FileDescriptorDataSourceUsingAssetFileDescriptorContractTest.java @@ -21,6 +21,7 @@ import androidx.media3.test.utils.DataSourceContractTest; import androidx.media3.test.utils.TestUtil; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.filters.SdkSuppress; import com.google.common.collect.ImmutableList; import org.junit.Ignore; import org.junit.Test; @@ -30,6 +31,8 @@ import org.junit.runner.RunWith; * {@link DataSource} contract tests for {@link FileDescriptorDataSource} using {@link * AssetFileDescriptor}. */ +// TODO: b/407727748 - Run this on lower API levels when it's no longer flaky. +@SdkSuppress(minSdkVersion = 29) @RunWith(AndroidJUnit4.class) public class FileDescriptorDataSourceUsingAssetFileDescriptorContractTest extends DataSourceContractTest {