From f248a106276d481633913d0c6a9d7e5bead77fa1 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 3 Mar 2020 09:17:08 +0000 Subject: [PATCH] [AVOD] Added if empty checks for streamKeys. DashMediaSource is created with Manifest data and streamKeys can be empty given that streamKeys are only created out of MediaItem inside DashMediaSource, and this particular implementation don't extract them out of MediaItem properties. Tested=Verified playback works. PiperOrigin-RevId: 298550021 --- .../google/android/exoplayer2/source/dash/DashMediaSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java index b9f08e9a31..e192077922 100644 --- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java +++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java @@ -258,7 +258,7 @@ public final class DashMediaSource extends BaseMediaSource { */ public DashMediaSource createMediaSource(DashManifest manifest) { Assertions.checkArgument(!manifest.dynamic); - if (streamKeys != null) { + if (streamKeys != null && !streamKeys.isEmpty()) { manifest = manifest.copy(streamKeys); } return new DashMediaSource(