From 2b409da881750328bffd276e53b027a6b1a96d06 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Mon, 22 May 2023 09:04:39 +0100
Subject: [PATCH] Remove deprecated zero-arg `DefaultTrackSelector` constructor

Use `DefaultTrackSelector(Context)` instead.

#minor-release

PiperOrigin-RevId: 533985937
---
 RELEASENOTES.md                                        |  2 ++
 .../exoplayer/trackselection/DefaultTrackSelector.java | 10 ++--------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ca36997083..1a8830f5c3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -88,6 +88,8 @@
         `copyWithBitrate` and `copyWithVideoSize`, use `Format.buildUpon()` and
         setter methods instead.
     *   Remove deprecated `ExoPlayer.retry()`, use `prepare()` instead.
+    *   Remove deprecated zero-arg `DefaultTrackSelector` constructor, use
+        `DefaultTrackSelector(Context)` instead.
 
 ### 1.0.2 (2023-05-18)
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
index 0e8738b14b..0782dd976a 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelector.java
@@ -2225,14 +2225,6 @@ public class DefaultTrackSelector extends MappingTrackSelector
   @GuardedBy("lock")
   private AudioAttributes audioAttributes;
 
-  /**
-   * @deprecated Use {@link #DefaultTrackSelector(Context)} instead.
-   */
-  @Deprecated
-  public DefaultTrackSelector() {
-    this(Parameters.DEFAULT_WITHOUT_CONTEXT, new AdaptiveTrackSelection.Factory());
-  }
-
   /**
    * @param context Any {@link Context}.
    */
@@ -2260,6 +2252,8 @@ public class DefaultTrackSelector extends MappingTrackSelector
    * @deprecated Use {@link #DefaultTrackSelector(Context, TrackSelectionParameters,
    *     ExoTrackSelection.Factory)}
    */
+  // TODO: When this constructor is deleted, this.context can be made non-null and all
+  //       null-conditional can be removed (including the warning logging when it's null).
   @Deprecated
   public DefaultTrackSelector(
       TrackSelectionParameters parameters, ExoTrackSelection.Factory trackSelectionFactory) {