From 13638f1c29327bfec7d1e887771bcce8fb2bfd34 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 2 Jan 2019 15:04:20 +0000
Subject: [PATCH] Remove AdsLoader listeners on releasing ImaAdsLoader

Issue: #4114
PiperOrigin-RevId: 227516509
---
 RELEASENOTES.md                                              | 5 +++++
 .../com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java  | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 1699f2c09b..b3e3d75ef6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,10 @@
 # Release notes #
 
+### 2.9.4 ###
+
+* IMA extension: Clear ads loader listeners on release
+  ([#4114](https://github.com/google/ExoPlayer/issues/4114)).
+
 ### 2.9.3 ###
 
 * Captions: Support PNG subtitles in SMPTE-TT
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 6ca3bfd881..9b4b66125c 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
@@ -597,6 +597,8 @@ public final class ImaAdsLoader
       adsManager.destroy();
       adsManager = null;
     }
+    adsLoader.removeAdsLoadedListener(/* adsLoadedListener= */ this);
+    adsLoader.removeAdErrorListener(/* adErrorListener= */ this);
     imaPausedContent = false;
     imaAdState = IMA_AD_STATE_NONE;
     pendingAdLoadError = null;