From 50112c685b093964be1da3a513bba5e0c86f3882 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Fri, 19 May 2023 16:39:14 +0100
Subject: [PATCH] Remove deprecated `ExoPlayer.retry()`, use `prepare()`
 instead.

#minor-release

PiperOrigin-RevId: 533463348
---
 RELEASENOTES.md                                       |  1 +
 .../java/androidx/media3/exoplayer/ExoPlayer.java     |  7 -------
 .../java/androidx/media3/exoplayer/ExoPlayerImpl.java |  7 -------
 .../androidx/media3/exoplayer/SimpleExoPlayer.java    | 11 -----------
 .../androidx/media3/test/utils/StubExoPlayer.java     |  9 ---------
 5 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d59ab865e2..36b27199b6 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -75,6 +75,7 @@
         `copyWithFrameRate`, `copyWithDrmInitData`, `copyWithMetadata`,
         `copyWithBitrate` and `copyWithVideoSize`, use `Format.buildUpon()` and
         setter methods instead.
+    *   Remove deprecated `ExoPlayer.retry()`, use `prepare()` instead.
 
 ### 1.0.2 (2023-05-18)
 
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
index 7bc70b0f1b..77cccb41ab 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java
@@ -1354,13 +1354,6 @@ public interface ExoPlayer extends Player {
   @UnstableApi
   Clock getClock();
 
-  /**
-   * @deprecated Use {@link #prepare()} instead.
-   */
-  @UnstableApi
-  @Deprecated
-  void retry();
-
   /**
    * @deprecated Use {@link #setMediaSource(MediaSource)} and {@link #prepare()} instead.
    */
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
index e063f6c53b..77b0252ce7 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java
@@ -520,13 +520,6 @@ import java.util.concurrent.TimeoutException;
     return playbackInfo.playbackError;
   }
 
-  @Override
-  @Deprecated
-  public void retry() {
-    verifyApplicationThread();
-    prepare();
-  }
-
   @Override
   public void prepare() {
     verifyApplicationThread();
diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java
index 1ccc62c0ad..edda6b71cb 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java
@@ -816,17 +816,6 @@ public class SimpleExoPlayer extends BasePlayer
     return player.getPlayerError();
   }
 
-  /**
-   * @deprecated Use {@link #prepare()} instead.
-   */
-  @Deprecated
-  @Override
-  @SuppressWarnings("deprecation") // Calling deprecated method.
-  public void retry() {
-    blockUntilConstructorFinished();
-    player.retry();
-  }
-
   @Override
   public Commands getAvailableCommands() {
     blockUntilConstructorFinished();
diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java
index 9cfbac5a7d..730fefd7e1 100644
--- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java
+++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java
@@ -130,15 +130,6 @@ public class StubExoPlayer extends StubPlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  /**
-   * @deprecated Use {@link #prepare()} instead.
-   */
-  @Deprecated
-  @Override
-  public void retry() {
-    throw new UnsupportedOperationException();
-  }
-
   /**
    * @deprecated Use {@link #setMediaSource(MediaSource)} and {@link #prepare()} instead.
    */