From b24d9f64a905e339ece678365d410aa0217dfa82 Mon Sep 17 00:00:00 2001
From: krocard <krocard@google.com>
Date: Thu, 18 Mar 2021 08:32:56 +0000
Subject: [PATCH] Implement deprecated getPlaybackError in PlayerBase

PiperOrigin-RevId: 363606255
---
 .../google/android/exoplayer2/ext/cast/CastPlayer.java    | 7 -------
 .../java/com/google/android/exoplayer2/BasePlayer.java    | 7 +++++++
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java | 7 -------
 .../com/google/android/exoplayer2/SimpleExoPlayer.java    | 8 --------
 .../google/android/exoplayer2/testutil/StubExoPlayer.java | 7 -------
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
index 09aef31b71..3742c9a607 100644
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -395,13 +395,6 @@ public final class CastPlayer extends BasePlayer {
     return Player.PLAYBACK_SUPPRESSION_REASON_NONE;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public ExoPlaybackException getPlaybackError() {
-    return getPlayerError();
-  }
-
   @Override
   @Nullable
   public ExoPlaybackException getPlayerError() {
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java b/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java
index a47b89ca25..cced9b8e4d 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/BasePlayer.java
@@ -136,6 +136,13 @@ public abstract class BasePlayer implements Player {
     removeMediaItems(/* fromIndex= */ 0, /* toIndex= */ Integer.MAX_VALUE);
   }
 
+  @Deprecated
+  @Override
+  @Nullable
+  public final ExoPlaybackException getPlaybackError() {
+    return getPlayerError();
+  }
+
   @Override
   public final void play() {
     setPlayWhenReady(true);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index d70821296a..f86ee73bde 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -333,13 +333,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
     return playbackInfo.playbackSuppressionReason;
   }
 
-  @Deprecated
-  @Override
-  @Nullable
-  public ExoPlaybackException getPlaybackError() {
-    return getPlayerError();
-  }
-
   @Override
   @Nullable
   public ExoPlaybackException getPlayerError() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
index 13a284ff7f..0f3613ad05 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java
@@ -1247,14 +1247,6 @@ public class SimpleExoPlayer extends BasePlayer
     return player.getPlaybackSuppressionReason();
   }
 
-  /** @deprecated Use {@link #getPlayerError()} instead. */
-  @Deprecated
-  @Override
-  @Nullable
-  public ExoPlaybackException getPlaybackError() {
-    return getPlayerError();
-  }
-
   @Override
   @Nullable
   public ExoPlaybackException getPlayerError() {
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
index d99a28f325..a51fdbbc42 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/StubExoPlayer.java
@@ -113,13 +113,6 @@ public abstract class StubExoPlayer extends BasePlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
-  /** @deprecated Use {@link #getPlayerError()} instead. */
-  @Deprecated
-  @Override
-  public ExoPlaybackException getPlaybackError() {
-    throw new UnsupportedOperationException();
-  }
-
   @Override
   public ExoPlaybackException getPlayerError() {
     throw new UnsupportedOperationException();