From 218e0bf885981b7d19ab2c4bb66033e5a3b384f3 Mon Sep 17 00:00:00 2001 From: ibaker Date: Mon, 18 Oct 2021 16:57:15 +0100 Subject: [PATCH] Demo: Fix NPE when restoring DRM info of a downloaded item DrmConfiguration.Builder#setLicenseRequestHeaders now rejects null, since https://github.com/google/ExoPlayer/commit/8fd1381a84470813827a83921cf3dd2b8603ecb0 This private method isn't needed at all, it's extracting the headers from the item that the DrmConfiguration.Builder is already based on. PiperOrigin-RevId: 403973523 --- .../android/exoplayer2/demo/PlayerActivity.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) 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 d0f84a401a..b5a1eefdfd 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 @@ -58,7 +58,6 @@ import com.google.android.exoplayer2.util.Util; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; /** An activity that plays media using {@link ExoPlayer}. */ public class PlayerActivity extends AppCompatActivity @@ -503,11 +502,7 @@ public class PlayerActivity extends AppCompatActivity MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration; if (drmConfiguration != null) { builder.setDrmConfiguration( - drmConfiguration - .buildUpon() - .setKeySetId(downloadRequest.keySetId) - .setLicenseRequestHeaders(getDrmRequestHeaders(item)) - .build()); + drmConfiguration.buildUpon().setKeySetId(downloadRequest.keySetId).build()); } mediaItems.add(builder.build()); @@ -517,10 +512,4 @@ public class PlayerActivity extends AppCompatActivity } return mediaItems; } - - @Nullable - private static Map getDrmRequestHeaders(MediaItem item) { - MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration; - return drmConfiguration != null ? drmConfiguration.licenseRequestHeaders : null; - } }