From cefc4dcd7725cd20bfa36a944fb60b44fcc91d70 Mon Sep 17 00:00:00 2001
From: michaelkatz <michaelkatz@google.com>
Date: Mon, 20 May 2024 08:52:22 -0700
Subject: [PATCH] Add OptIn annotations to declarations in demo app files

#minor-release

PiperOrigin-RevId: 635469477
---
 .../main/java/androidx/media3/demo/main/DemoUtil.java | 11 +++++++++++
 .../media3/demo/main/SampleChooserActivity.java       |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java b/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
index 2a5a4bfbbe..f64e78c8c7 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/DemoUtil.java
@@ -60,11 +60,21 @@ public final class DemoUtil {
 
   private static DataSource.@MonotonicNonNull Factory dataSourceFactory;
   private static DataSource.@MonotonicNonNull Factory httpDataSourceFactory;
+
+  @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
   private static @MonotonicNonNull DatabaseProvider databaseProvider;
+
   private static @MonotonicNonNull File downloadDirectory;
+
+  @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
   private static @MonotonicNonNull Cache downloadCache;
+
+  @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
   private static @MonotonicNonNull DownloadManager downloadManager;
+
   private static @MonotonicNonNull DownloadTracker downloadTracker;
+
+  @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
   private static @MonotonicNonNull DownloadNotificationHelper downloadNotificationHelper;
 
   /** Returns whether extension renderers should be used. */
@@ -128,6 +138,7 @@ public final class DemoUtil {
     return downloadNotificationHelper;
   }
 
+  @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
   public static synchronized DownloadManager getDownloadManager(Context context) {
     ensureDownloadManagerInitialized(context);
     return downloadManager;
diff --git a/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java
index a5fa267a35..9fb1097fd8 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/SampleChooserActivity.java
@@ -67,6 +67,7 @@ import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 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) {
     RenderersFactory renderersFactory =
         DemoUtil.buildRenderersFactory(
@@ -313,7 +315,8 @@ public class SampleChooserActivity extends AppCompatActivity
               InputStream inputStream = new DataSourceInputStream(dataSource, dataSpec);
               try {
                 readPlaylistGroups(
-                    new JsonReader(new InputStreamReader(inputStream, "UTF-8")), result);
+                    new JsonReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)),
+                    result);
               } catch (Exception e) {
                 Log.e(TAG, "Error loading sample list: " + uri, e);
                 sawError = true;