loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add OptIn annotations to declarations in demo app files

Browse Source 
#minor-release

PiperOrigin-RevId: 635469477
This commit is contained in:
michaelkatz 2024-05-20 08:52:22 -07:00 committed by Copybara-Service
parent c26042d7ca
commit cefc4dcd77
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
View File

@ -60,11 +60,21 @@ public final class DemoUtil {
private static DataSource.@MonotonicNonNull Factory dataSourceFactory; private static DataSource.@MonotonicNonNull Factory dataSourceFactory;
private static DataSource.@MonotonicNonNull Factory httpDataSourceFactory; private static DataSource.@MonotonicNonNull Factory httpDataSourceFactory;
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
private static @MonotonicNonNull DatabaseProvider databaseProvider; private static @MonotonicNonNull DatabaseProvider databaseProvider;
private static @MonotonicNonNull File downloadDirectory; private static @MonotonicNonNull File downloadDirectory;
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
private static @MonotonicNonNull Cache downloadCache; private static @MonotonicNonNull Cache downloadCache;
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
private static @MonotonicNonNull DownloadManager downloadManager; private static @MonotonicNonNull DownloadManager downloadManager;
private static @MonotonicNonNull DownloadTracker downloadTracker; private static @MonotonicNonNull DownloadTracker downloadTracker;
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
private static @MonotonicNonNull DownloadNotificationHelper downloadNotificationHelper; private static @MonotonicNonNull DownloadNotificationHelper downloadNotificationHelper;
/** Returns whether extension renderers should be used. */ /** Returns whether extension renderers should be used. */
@ -128,6 +138,7 @@ public final class DemoUtil {
return downloadNotificationHelper; return downloadNotificationHelper;
} }
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
public static synchronized DownloadManager getDownloadManager(Context context) { public static synchronized DownloadManager getDownloadManager(Context context) {
ensureDownloadManagerInitialized(context); ensureDownloadManagerInitialized(context);
return downloadManager; return downloadManager;

5
demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java
View File

@ -67,6 +67,7 @@ import com.google.common.collect.ImmutableMap;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -259,6 +260,7 @@ public class SampleChooserActivity extends AppCompatActivity
} }
} }
@OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
private void toggleDownload(MediaItem mediaItem) { private void toggleDownload(MediaItem mediaItem) {
RenderersFactory renderersFactory = RenderersFactory renderersFactory =
DemoUtil.buildRenderersFactory( DemoUtil.buildRenderersFactory(
@ -313,7 +315,8 @@ public class SampleChooserActivity extends AppCompatActivity
InputStream inputStream = new DataSourceInputStream(dataSource, dataSpec); InputStream inputStream = new DataSourceInputStream(dataSource, dataSpec);
try { try {
readPlaylistGroups( readPlaylistGroups(
new JsonReader(new InputStreamReader(inputStream, "UTF-8")), result); new JsonReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)),
result);
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Error loading sample list: " + uri, e); Log.e(TAG, "Error loading sample list: " + uri, e);
sawError = true; sawError = true;