From 7d4a013c80eb0b6914d630cdf5cd353bd7ab3228 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 21 Apr 2021 10:37:49 +0100
Subject: [PATCH] Remove more deprecated methods from ExoPlayerFactory

PiperOrigin-RevId: 369615413
---
 .../android/exoplayer2/ExoPlayerFactory.java  | 30 -------------------
 1 file changed, 30 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
index 411098c218..74ee1323d1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
@@ -18,7 +18,6 @@ package com.google.android.exoplayer2;
 import android.content.Context;
 import com.google.android.exoplayer2.analytics.AnalyticsCollector;
 import com.google.android.exoplayer2.source.DefaultMediaSourceFactory;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.util.Clock;
@@ -30,13 +29,6 @@ public final class ExoPlayerFactory {
 
   private ExoPlayerFactory() {}
 
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  @SuppressWarnings("deprecation")
-  public static SimpleExoPlayer newSimpleInstance(Context context) {
-    return newSimpleInstance(context, new DefaultTrackSelector(context));
-  }
-
   /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
   @Deprecated
   @SuppressWarnings("deprecation")
@@ -72,26 +64,4 @@ public final class ExoPlayerFactory {
         Clock.DEFAULT,
         Util.getCurrentOrMainLooper());
   }
-
-  /** @deprecated Use {@link SimpleExoPlayer.Builder} instead. */
-  @Deprecated
-  public static ExoPlayer newInstance(
-      Context context, Renderer[] renderers, TrackSelector trackSelector, LoadControl loadControl) {
-    return new ExoPlayerImpl(
-        renderers,
-        trackSelector,
-        new DefaultMediaSourceFactory(context),
-        loadControl,
-        DefaultBandwidthMeter.getSingletonInstance(context),
-        /* analyticsCollector= */ null,
-        /* useLazyPreparation= */ true,
-        SeekParameters.DEFAULT,
-        new DefaultLivePlaybackSpeedControl.Builder().build(),
-        ExoPlayer.DEFAULT_RELEASE_TIMEOUT_MS,
-        /* pauseAtEndOfMediaItems= */ false,
-        Clock.DEFAULT,
-        Util.getCurrentOrMainLooper(),
-        /* wrappingPlayer= */ null,
-        /* additionalPermanentAvailableCommands= */ Player.Commands.EMPTY);
-  }
 }