Migrate overrides of deprecated AdsViewProvider.getAdOverlayViews

PiperOrigin-RevId: 321121735

extensions/ima/build.gradle

@@ -35,6 +35,7 @@ dependencies {
     androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.multidex:multidex:' + androidxMultidexVersion
     androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
     androidTestImplementation 'androidx.test:rules:' + androidxTestRulesVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
     androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    androidTestImplementation 'com.google.guava:guava:' + guavaVersion
     androidTestCompileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     androidTestCompileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'com.google.guava:guava:' + guavaVersion
     testImplementation 'com.google.guava:guava:' + guavaVersion

extensions/ima/src/androidTest/java/com/google/android/exoplayer2/ext/ima/ImaPlaybackTest.java

@@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat;
 import android.content.Context;
 import android.content.Context;
 import android.net.Uri;
 import android.net.Uri;
 import android.view.Surface;
 import android.view.Surface;
-import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout;
 import androidx.annotation.Nullable;
 import androidx.annotation.Nullable;
@@ -39,6 +38,7 @@ import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
 import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.source.ads.AdsLoader.AdViewProvider;
 import com.google.android.exoplayer2.source.ads.AdsLoader.AdViewProvider;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.testutil.ActionSchedule;
 import com.google.android.exoplayer2.testutil.ActionSchedule;
@@ -50,6 +50,7 @@ import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
+import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
@@ -249,14 +250,15 @@ public final class ImaPlaybackTest {
           dataSourceFactory,
           dataSourceFactory,
           Assertions.checkNotNull(imaAdsLoader),
           Assertions.checkNotNull(imaAdsLoader),
           new AdViewProvider() {
           new AdViewProvider() {
+
             @Override
             @Override
             public ViewGroup getAdViewGroup() {
             public ViewGroup getAdViewGroup() {
               return overlayFrameLayout;
               return overlayFrameLayout;
             }
             }
 
 
             @Override
             @Override
-            public View[] getAdOverlayViews() {
-              return new View[0];
+            public ImmutableList<AdsLoader.OverlayInfo> getAdOverlayInfos() {
+              return ImmutableList.of();
             }
             }
           });
           });
     }
     }

extensions/ima/src/test/java/com/google/android/exoplayer2/ext/ima/ImaAdsLoaderTest.java

@@ -116,7 +116,6 @@ public final class ImaAdsLoaderTest {
   @Mock private AdEvent mockPostrollFetchErrorAdEvent;
   @Mock private AdEvent mockPostrollFetchErrorAdEvent;
 
 
   private ViewGroup adViewGroup;
   private ViewGroup adViewGroup;
-  private View adOverlayView;
   private AdsLoader.AdViewProvider adViewProvider;
   private AdsLoader.AdViewProvider adViewProvider;
   private AdEvent.AdEventListener adEventListener;
   private AdEvent.AdEventListener adEventListener;
   private ContentProgressProvider contentProgressProvider;
   private ContentProgressProvider contentProgressProvider;
@@ -129,7 +128,7 @@ public final class ImaAdsLoaderTest {
   public void setUp() {
   public void setUp() {
     setupMocks();
     setupMocks();
     adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
     adViewGroup = new FrameLayout(ApplicationProvider.getApplicationContext());
-    adOverlayView = new View(ApplicationProvider.getApplicationContext());
+    View adOverlayView = new View(ApplicationProvider.getApplicationContext());
     adViewProvider =
     adViewProvider =
         new AdsLoader.AdViewProvider() {
         new AdsLoader.AdViewProvider() {
           @Override
           @Override
@@ -138,8 +137,9 @@ public final class ImaAdsLoaderTest {
           }
           }
 
 
           @Override
           @Override
-          public View[] getAdOverlayViews() {
-            return new View[] {adOverlayView};
+          public ImmutableList<AdsLoader.OverlayInfo> getAdOverlayInfos() {
+            return ImmutableList.of(
+                new AdsLoader.OverlayInfo(adOverlayView, AdsLoader.OverlayInfo.PURPOSE_CLOSE_AD));
           }
           }
         };
         };
   }
   }