From 161dea661f7d83508fc4825dd55cbacf7e65d97a Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 16 Jul 2020 14:33:19 +0100
Subject: [PATCH] Assorted deprecation fixes/migrations/suppressions

These were missed on the first pass

PiperOrigin-RevId: 321553847
---
 .../src/main/java/com/google/android/exoplayer2/C.java       | 4 +++-
 .../java/com/google/android/exoplayer2/ExoPlayerTest.java    | 5 ++---
 .../android/exoplayer2/playbacktests/gts/DashTestRunner.java | 5 ++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/C.java b/library/common/src/main/java/com/google/android/exoplayer2/C.java
index bcb57c7d3c..c4f4a2bbb5 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/C.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/C.java
@@ -579,7 +579,9 @@ public final class C {
   public static final int VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING =
       MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING;
   /** @deprecated Use {@code Renderer.VIDEO_SCALING_MODE_DEFAULT}. */
-  @Deprecated public static final int VIDEO_SCALING_MODE_DEFAULT = VIDEO_SCALING_MODE_SCALE_TO_FIT;
+  @SuppressWarnings("deprecation")
+  @Deprecated
+  public static final int VIDEO_SCALING_MODE_DEFAULT = VIDEO_SCALING_MODE_SCALE_TO_FIT;
 
   /**
    * Track selection flags. Possible flag values are {@link #SELECTION_FLAG_DEFAULT}, {@link
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 4733637c82..25f94da208 100644
--- a/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -35,7 +35,6 @@ import android.media.AudioManager;
 import android.net.Uri;
 import android.os.Looper;
 import android.view.Surface;
-import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
@@ -8326,8 +8325,8 @@ public final class ExoPlayerTest {
     }
 
     @Override
-    public View[] getAdOverlayViews() {
-      return new View[0];
+    public ImmutableList<AdsLoader.OverlayInfo> getAdOverlayInfos() {
+      return ImmutableList.of();
     }
   }
 }
diff --git a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
index c8c4f98a85..3d37d18182 100644
--- a/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashTestRunner.java
@@ -19,13 +19,13 @@ import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
 
 import android.media.MediaDrm;
 import android.media.UnsupportedSchemeException;
-import android.net.Uri;
 import android.view.Surface;
 import android.widget.FrameLayout;
 import androidx.annotation.RequiresApi;
 import androidx.test.core.app.ApplicationProvider;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.RendererCapabilities;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
@@ -308,11 +308,10 @@ import java.util.List;
           this.dataSourceFactory != null
               ? this.dataSourceFactory
               : new DefaultDataSourceFactory(host, userAgent);
-      Uri manifestUri = Uri.parse(manifestUrl);
       return new DashMediaSource.Factory(dataSourceFactory)
           .setDrmSessionManager(drmSessionManager)
           .setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(MIN_LOADABLE_RETRY_COUNT))
-          .createMediaSource(manifestUri);
+          .createMediaSource(MediaItem.fromUri(manifestUrl));
     }
 
     @Override