From c97ee9429ba8c7284268f0b9abd1b0584c23ee1c Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 26 Apr 2019 10:25:21 +0100
Subject: [PATCH] Allow content id to be set in
 DownloadHelper.getDownloadRequest

PiperOrigin-RevId: 245388082
---
 .../exoplayer2/offline/DownloadHelper.java    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
index c9b0451f41..8a15c82c89 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
@@ -578,16 +578,27 @@ public final class DownloadHelper {
 
   /**
    * Builds a {@link DownloadRequest} for downloading the selected tracks. Must not be called until
-   * after preparation completes.
+   * after preparation completes. The uri of the {@link DownloadRequest} will be used as content id.
    *
    * @param data Application provided data to store in {@link DownloadRequest#data}.
    * @return The built {@link DownloadRequest}.
    */
   public DownloadRequest getDownloadRequest(@Nullable byte[] data) {
-    String downloadId = uri.toString();
+    return getDownloadRequest(uri.toString(), data);
+  }
+
+  /**
+   * Builds a {@link DownloadRequest} for downloading the selected tracks. Must not be called until
+   * after preparation completes.
+   *
+   * @param id The unique content id.
+   * @param data Application provided data to store in {@link DownloadRequest#data}.
+   * @return The built {@link DownloadRequest}.
+   */
+  public DownloadRequest getDownloadRequest(String id, @Nullable byte[] data) {
     if (mediaSource == null) {
       return new DownloadRequest(
-          downloadId, downloadType, uri, /* streamKeys= */ Collections.emptyList(), cacheKey, data);
+          id, downloadType, uri, /* streamKeys= */ Collections.emptyList(), cacheKey, data);
     }
     assertPreparedWithMedia();
     List<StreamKey> streamKeys = new ArrayList<>();
@@ -601,7 +612,7 @@ public final class DownloadHelper {
       }
       streamKeys.addAll(mediaPreparer.mediaPeriods[periodIndex].getStreamKeys(allSelections));
     }
-    return new DownloadRequest(downloadId, downloadType, uri, streamKeys, cacheKey, data);
+    return new DownloadRequest(id, downloadType, uri, streamKeys, cacheKey, data);
   }
 
   // Initialization of array of Lists.