Commit 422e68b4 by ibaker Committed by Oliver Woodman

Demo: Fix NPE in SampleChooserActivity

This prevents the demo app loading media.exolist.json. The exception
was introduced by
https://github.com/google/ExoPlayer/commit/8fd1381a84470813827a83921cf3dd2b8603ecb0

PiperOrigin-RevId: 403973062
parent dd23cb13
...@@ -348,7 +348,7 @@ public class SampleChooserActivity extends AppCompatActivity ...@@ -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 ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment