From 968a0baa8d04156dfcb4909e425522fb8cc343f3 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Fri, 3 Jul 2020 11:45:57 +0100 Subject: [PATCH] Fix handling of intents with no license server URI PiperOrigin-RevId: 319497156 --- .../java/com/google/android/exoplayer2/demo/IntentUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java index 96faac8d92..474ec25db6 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java @@ -274,7 +274,7 @@ public class IntentUtil { intent.putExtra(DRM_SCHEME_EXTRA + extrasKeySuffix, drmConfiguration.uuid.toString()); intent.putExtra( DRM_LICENSE_URL_EXTRA + extrasKeySuffix, - checkNotNull(drmConfiguration.licenseUri).toString()); + drmConfiguration.licenseUri != null ? drmConfiguration.licenseUri.toString() : null); intent.putExtra(DRM_MULTI_SESSION_EXTRA + extrasKeySuffix, drmConfiguration.multiSession); intent.putExtra( DRM_FORCE_DEFAULT_LICENSE_URI_EXTRA + extrasKeySuffix,