From d0d0935f3f468fb43a95b7ace853de294bfc42de Mon Sep 17 00:00:00 2001 From: christosts Date: Tue, 29 Mar 2022 14:35:43 +0100 Subject: [PATCH] Fix NPE in PlayerActivity PiperOrigin-RevId: 438010395 --- .../com/google/android/exoplayer2/demo/PlayerActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java index e362efec4c..639876061a 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java @@ -518,6 +518,9 @@ public class PlayerActivity extends AppCompatActivity private static MediaItem maybeSetDownloadProperties( MediaItem item, @Nullable DownloadRequest downloadRequest) { + if (downloadRequest == null) { + return item; + } MediaItem.Builder builder = item.buildUpon(); builder .setMediaId(downloadRequest.id)