From 4289112947dfac41c1ea45f14c01153bf3fe2eab Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Mon, 2 Nov 2020 11:06:17 +0000 Subject: [PATCH] Fix buildForAdsResponse PiperOrigin-RevId: 340198099 --- RELEASENOTES.md | 1 + .../com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index ecee8de2f0..3746e3650d 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -37,6 +37,7 @@ ([#7832](https://github.com/google/ExoPlayer/issues/7832)). * Fix a bug that caused multiple ads in an ad pod to be skipped when one ad in the ad pod was skipped. + * Fix passing an ads response to the `ImaAdsLoader` builder. ### 2.12.1 (2020-10-23) ### diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java index 852ab4e96a..2bd8e0c03d 100644 --- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java +++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java @@ -458,7 +458,8 @@ public final class ImaAdsLoader adTagUri != null ? new DataSpec(adTagUri) : adsResponse != null - ? new DataSpec(Util.getDataUriForString(adsResponse, "text/xml")) + ? new DataSpec( + Util.getDataUriForString(/* mimeType= */ "text/xml", /* data= */ adsResponse)) : null; adTagDataSpec = EMPTY_AD_TAG_DATA_SPEC; supportedMimeTypes = ImmutableList.of();