From 2adf0f67d8f001b4c16f0ebc4c1c85f02719fd00 Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Tue, 29 Mar 2022 14:35:43 +0100
Subject: [PATCH] Fix NPE in PlayerActivity

PiperOrigin-RevId: 438010395
---
 .../main/java/androidx/media3/demo/main/PlayerActivity.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
index f556d8c8cb..c2ebd97480 100644
--- a/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
+++ b/demos/main/src/main/java/androidx/media3/demo/main/PlayerActivity.java
@@ -520,6 +520,9 @@ public class PlayerActivity extends AppCompatActivity
   @OptIn(markerClass = androidx.media3.common.util.UnstableApi.class)
   private static MediaItem maybeSetDownloadProperties(
       MediaItem item, @Nullable DownloadRequest downloadRequest) {
+    if (downloadRequest == null) {
+      return item;
+    }
     MediaItem.Builder builder = item.buildUpon();
     builder
         .setMediaId(downloadRequest.id)