diff --git a/libraries/datasource/src/androidTest/AndroidManifest.xml b/libraries/datasource/src/androidTest/AndroidManifest.xml index 32373d1c2a..5c48ae1487 100644 --- a/libraries/datasource/src/androidTest/AndroidManifest.xml +++ b/libraries/datasource/src/androidTest/AndroidManifest.xml @@ -27,7 +27,7 @@ android:usesCleartextTraffic="true" tools:ignore="MissingApplicationIcon,HardcodedDebugMode"> diff --git a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceContractTest.java b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceContractTest.java index 50bc10e287..da644b2b43 100644 --- a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceContractTest.java +++ b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceContractTest.java @@ -28,6 +28,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class ContentDataSourceContractTest extends DataSourceContractTest { + private static final String AUTHORITY = "androidx.media3.datasource.test.AssetContentProvider"; private static final String DATA_PATH = "media/mp3/1024_incrementing_bytes.mp3"; @Override @@ -42,18 +43,18 @@ public final class ContentDataSourceContractTest extends DataSourceContractTest return ImmutableList.of( new TestResource.Builder() .setName("simple (pipe=false)") - .setUri(AssetContentProvider.buildUri(DATA_PATH, /* pipeMode= */ false)) + .setUri(AssetContentProvider.buildUri(AUTHORITY, DATA_PATH, /* pipeMode= */ false)) .setExpectedBytes(completeData) .build(), new TestResource.Builder() .setName("simple (pipe=true)") - .setUri(AssetContentProvider.buildUri(DATA_PATH, /* pipeMode= */ true)) + .setUri(AssetContentProvider.buildUri(AUTHORITY, DATA_PATH, /* pipeMode= */ true)) .setExpectedBytes(completeData) .build()); } @Override protected Uri getNotFoundUri() { - return AssetContentProvider.buildUri("not/a/real/path", /* pipeMode= */ false); + return AssetContentProvider.buildUri(AUTHORITY, "not/a/real/path", /* pipeMode= */ false); } } diff --git a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceTest.java b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceTest.java index f7523980cb..a8bd36ad9d 100644 --- a/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceTest.java +++ b/libraries/datasource/src/androidTest/java/androidx/media3/datasource/ContentDataSourceTest.java @@ -34,6 +34,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) public final class ContentDataSourceTest { + private static final String AUTHORITY = "androidx.media3.datasource.test.AssetContentProvider"; private static final String DATA_PATH = "media/mp3/1024_incrementing_bytes.mp3"; @Test @@ -70,7 +71,7 @@ public final class ContentDataSourceTest { public void readInvalidUri() throws Exception { ContentDataSource dataSource = new ContentDataSource(ApplicationProvider.getApplicationContext()); - Uri contentUri = AssetContentProvider.buildUri("does/not.exist", false); + Uri contentUri = AssetContentProvider.buildUri(AUTHORITY, "does/not.exist", false); DataSpec dataSpec = new DataSpec(contentUri); try { dataSource.open(dataSpec); @@ -84,7 +85,7 @@ public final class ContentDataSourceTest { } private static void assertData(int offset, int length, boolean pipeMode) throws IOException { - Uri contentUri = AssetContentProvider.buildUri(DATA_PATH, pipeMode); + Uri contentUri = AssetContentProvider.buildUri(AUTHORITY, DATA_PATH, pipeMode); ContentDataSource dataSource = new ContentDataSource(ApplicationProvider.getApplicationContext()); try { diff --git a/libraries/exoplayer/src/androidTest/AndroidManifest.xml b/libraries/exoplayer/src/androidTest/AndroidManifest.xml index 7811c2d024..00bd5c0d16 100644 --- a/libraries/exoplayer/src/androidTest/AndroidManifest.xml +++ b/libraries/exoplayer/src/androidTest/AndroidManifest.xml @@ -27,7 +27,7 @@ tools:ignore="MissingApplicationIcon,HardcodedDebugMode" android:usesCleartextTraffic="true"> diff --git a/libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/MediaExtractorContractTest.java b/libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/MediaExtractorContractTest.java index 2fdfad3069..9b6e7e0582 100644 --- a/libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/MediaExtractorContractTest.java +++ b/libraries/exoplayer/src/androidTest/java/androidx/media3/exoplayer/MediaExtractorContractTest.java @@ -72,6 +72,8 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) public class MediaExtractorContractTest { + private static final String AUTHORITY = "androidx.media3.exoplayer.test.AssetContentProvider"; + @Parameters(name = "{0}") public static ImmutableList> mediaExtractorProxyFactories() { @@ -226,7 +228,8 @@ public class MediaExtractorContractTest { @Test public void setDataSource_withContentUri_returnsCorrectTrackCount() throws IOException { - Uri contentUri = AssetContentProvider.buildUri("media/mp4/sample.mp4", /* pipeMode= */ false); + Uri contentUri = + AssetContentProvider.buildUri(AUTHORITY, "media/mp4/sample.mp4", /* pipeMode= */ false); mediaExtractorProxy.setDataSource(context, contentUri, /* headers= */ null); diff --git a/libraries/exoplayer/src/test/AndroidManifest.xml b/libraries/exoplayer/src/test/AndroidManifest.xml index 012bc686e9..85663a9b39 100644 --- a/libraries/exoplayer/src/test/AndroidManifest.xml +++ b/libraries/exoplayer/src/test/AndroidManifest.xml @@ -21,8 +21,5 @@ android:allowBackup="false" android:usesCleartextTraffic="true" tools:ignore="MissingApplicationIcon,HardcodedDebugMode"> - diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/AssetContentProvider.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/AssetContentProvider.java index 21500b7056..3845cc7e92 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/AssetContentProvider.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/AssetContentProvider.java @@ -38,14 +38,13 @@ import java.io.IOException; public final class AssetContentProvider extends ContentProvider implements ContentProvider.PipeDataWriter { - private static final String AUTHORITY = "androidx.media3.test.utils.AssetContentProvider"; private static final String PARAM_PIPE_MODE = "pipe-mode"; - public static Uri buildUri(String filePath, boolean pipeMode) { + public static Uri buildUri(String authority, String filePath, boolean pipeMode) { Uri.Builder builder = new Uri.Builder() .scheme(ContentResolver.SCHEME_CONTENT) - .authority(AUTHORITY) + .authority(authority) .path(filePath); if (pipeMode) { builder.appendQueryParameter(PARAM_PIPE_MODE, "1");