loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Demo: Fix NPE when restoring DRM info of a downloaded item

Browse Source 
DrmConfiguration.Builder#setLicenseRequestHeaders now rejects null,
since 8fd1381a84

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
This commit is contained in:
ibaker 2021-10-18 16:57:15 +01:00 committed by Oliver Woodman
parent 422e68b48d
commit 218e0bf885
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
View File

@ -58,7 +58,6 @@ import com.google.android.exoplayer2.util.Util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
/** An activity that plays media using {@link ExoPlayer}. */ /** An activity that plays media using {@link ExoPlayer}. */
public class PlayerActivity extends AppCompatActivity public class PlayerActivity extends AppCompatActivity
@ -503,11 +502,7 @@ public class PlayerActivity extends AppCompatActivity
MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration; MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration;
if (drmConfiguration != null) { if (drmConfiguration != null) {
builder.setDrmConfiguration( builder.setDrmConfiguration(
drmConfiguration drmConfiguration.buildUpon().setKeySetId(downloadRequest.keySetId).build());
.buildUpon()
.setKeySetId(downloadRequest.keySetId)
.setLicenseRequestHeaders(getDrmRequestHeaders(item))
.build());
} }
mediaItems.add(builder.build()); mediaItems.add(builder.build());
@ -517,10 +512,4 @@ public class PlayerActivity extends AppCompatActivity
} }
return mediaItems; return mediaItems;
} }
@Nullable
private static Map<String, String> getDrmRequestHeaders(MediaItem item) {
MediaItem.DrmConfiguration drmConfiguration = item.localConfiguration.drmConfiguration;
return drmConfiguration != null ? drmConfiguration.licenseRequestHeaders : null;
}
} }