From 7b5b8b2d797d2151987e68d95f155d0642a8d15b Mon Sep 17 00:00:00 2001
From: christosts <christosts@google.com>
Date: Wed, 16 Sep 2020 09:35:07 +0100
Subject: [PATCH] Fix bug in offline DRM downloads

PiperOrigin-RevId: 331955966
---
 .../android/exoplayer2/demo/PlayerActivity.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 49fe440101..eae302887e 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
@@ -543,7 +543,19 @@ public class PlayerActivity extends AppCompatActivity
       @Nullable
       DownloadRequest downloadRequest =
           downloadTracker.getDownloadRequest(checkNotNull(item.playbackProperties).uri);
-      mediaItems.add(downloadRequest != null ? downloadRequest.toMediaItem() : item);
+      if (downloadRequest != null) {
+        MediaItem.Builder builder = item.buildUpon();
+        builder
+            .setMediaId(downloadRequest.id)
+            .setUri(downloadRequest.uri)
+            .setCustomCacheKey(downloadRequest.customCacheKey)
+            .setMimeType(downloadRequest.mimeType)
+            .setStreamKeys(downloadRequest.streamKeys)
+            .setDrmKeySetId(downloadRequest.keySetId);
+        mediaItems.add(builder.build());
+      } else {
+        mediaItems.add(item);
+      }
     }
     return mediaItems;
   }