From 04943db71c138e25352aa5f5cea1db806dce597c Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 17 Sep 2021 12:36:52 +0100 Subject: [PATCH] Don't call `MediaItem.Builder#setKeySetId` without setting the DRM UUID This is known to silently drop the value. This setter is now deprecated in favour of `MediaItem.Builder#setDrmConfiguration(MediaItem.DrmConfiguration)`, which requires a UUID in order to construct the `DrmConfiguration` instance. Issue: #9378 tracks correctly propagating the DRM info out of `DownloadRequest#toMediaItem`. PiperOrigin-RevId: 397291013 --- .../android/exoplayer2/offline/DefaultDownloaderFactory.java | 1 - .../com/google/android/exoplayer2/offline/DownloadRequest.java | 1 - 2 files changed, 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java index bed0bb26a3..eb7dc31240 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DefaultDownloaderFactory.java @@ -98,7 +98,6 @@ public class DefaultDownloaderFactory implements DownloaderFactory { .setUri(request.uri) .setStreamKeys(request.streamKeys) .setCustomCacheKey(request.customCacheKey) - .setDrmKeySetId(request.keySetId) .build(); try { return constructor.newInstance(mediaItem, cacheDataSourceFactory, executor); diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java index 1fa1655445..e6b16f70cc 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadRequest.java @@ -229,7 +229,6 @@ public final class DownloadRequest implements Parcelable { .setCustomCacheKey(customCacheKey) .setMimeType(mimeType) .setStreamKeys(streamKeys) - .setDrmKeySetId(keySetId) .build(); }