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

Demo: Fix NPE in SampleChooserActivity

Browse Source 
This prevents the demo app loading media.exolist.json. The exception
was introduced by
8fd1381a84

PiperOrigin-RevId: 403973062
This commit is contained in:
ibaker 2021-10-18 16:55:00 +01:00 committed by Oliver Woodman
parent dd23cb13da
commit 422e68b48d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
View File

@ -348,7 +348,7 @@ public class SampleChooserActivity extends AppCompatActivity
String subtitleLanguage = null; String subtitleLanguage = null;
UUID drmUuid = null; UUID drmUuid = null;
String drmLicenseUri = null; String drmLicenseUri = null;
ImmutableMap<String, String> drmLicenseRequestHeaders = null; ImmutableMap<String, String> drmLicenseRequestHeaders = ImmutableMap.of();
boolean drmSessionForClearContent = false; boolean drmSessionForClearContent = false;
boolean drmMultiSession = false; boolean drmMultiSession = false;
boolean drmForceDefaultLicenseUri = false; boolean drmForceDefaultLicenseUri = false;
@ -453,7 +453,7 @@ public class SampleChooserActivity extends AppCompatActivity
} else { } else {
checkState(drmLicenseUri == null, "drm_uuid is required if drm_license_uri is set."); checkState(drmLicenseUri == null, "drm_uuid is required if drm_license_uri is set.");
checkState( checkState(
drmLicenseRequestHeaders == null, drmLicenseRequestHeaders.isEmpty(),
"drm_uuid is required if drm_key_request_properties is set."); "drm_uuid is required if drm_key_request_properties is set.");
checkState( checkState(
!drmSessionForClearContent, !drmSessionForClearContent,