More demo app unstable API opt-in and reshuffling

Follow-up to https://github.com/androidx/media/commit/a5330d43d4c3b5c464d9d35d39c0185216587c90

PiperOrigin-RevId: 437777871

demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java

@@ -28,6 +28,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
+import androidx.annotation.OptIn;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.media3.common.AudioAttributes;
 import androidx.media3.common.AudioAttributes;
 import androidx.media3.common.C;
 import androidx.media3.common.C;
@@ -509,29 +510,29 @@ public class PlayerActivity extends AppCompatActivity
   private static List<MediaItem> createMediaItems(Intent intent, DownloadTracker downloadTracker) {
   private static List<MediaItem> createMediaItems(Intent intent, DownloadTracker downloadTracker) {
     List<MediaItem> mediaItems = new ArrayList<>();
     List<MediaItem> mediaItems = new ArrayList<>();
     for (MediaItem item : IntentUtil.createMediaItemsFromIntent(intent)) {
     for (MediaItem item : IntentUtil.createMediaItemsFromIntent(intent)) {
-      @Nullable
-      DownloadRequest downloadRequest =
-          downloadTracker.getDownloadRequest(item.localConfiguration.uri);
-      if (downloadRequest != null) {
-        MediaItem.Builder builder = item.buildUpon();
-        builder
-            .setMediaId(downloadRequest.id)
-            .setUri(downloadRequest.uri)
-            .setCustomCacheKey(downloadRequest.customCacheKey)
-            .setMimeType(downloadRequest.mimeType)
-            .setStreamKeys(downloadRequest.streamKeys);
-        @Nullable
-        MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration;
-        if (drmConfiguration != null) {
-          builder.setDrmConfiguration(
-              drmConfiguration.buildUpon().setKeySetId(downloadRequest.keySetId).build());
-        }
-
-        mediaItems.add(builder.build());
-      } else {
-        mediaItems.add(item);
-      }
+      mediaItems.add(
+          maybeSetDownloadProperties(
+              item, downloadTracker.getDownloadRequest(item.localConfiguration.uri)));
     }
     }
     return mediaItems;
     return mediaItems;
   }
   }
+
+  @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
+  private static MediaItem maybeSetDownloadProperties(
+      MediaItem item, @Nullable DownloadRequest downloadRequest) {
+    MediaItem.Builder builder = item.buildUpon();
+    builder
+        .setMediaId(downloadRequest.id)
+        .setUri(downloadRequest.uri)
+        .setCustomCacheKey(downloadRequest.customCacheKey)
+        .setMimeType(downloadRequest.mimeType)
+        .setStreamKeys(downloadRequest.streamKeys);
+    @Nullable
+    MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration;
+    if (drmConfiguration != null) {
+      builder.setDrmConfiguration(
+          drmConfiguration.buildUpon().setKeySetId(downloadRequest.keySetId).build());
+    }
+    return builder.build();
+  }
 }
 }