From a26caae4cad448bcff9290ca546352303a5a8597 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Fri, 1 Oct 2021 16:57:46 +0100
Subject: [PATCH] Remove BasePlayer stop as a final method.

It calls through to a deprecated method, which is unusual for a
convenience method, and the deprecated method has various
implementations. This allows for a smoother removal of stop(boolean)
and removes an obstacle for the ExoPlayer-SimpleExoPlayer merge.

Adds missing @Deprecated tags to some Players.

PiperOrigin-RevId: 400213422
---
 .../com/google/android/exoplayer2/ext/cast/CastPlayer.java  | 6 ++++++
 .../main/java/com/google/android/exoplayer2/BasePlayer.java | 5 -----
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java   | 6 ++++++
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java | 5 +++++
 .../google/android/exoplayer2/testutil/StubExoPlayer.java   | 6 ++++++
 5 files changed, 23 insertions(+), 5 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 97b0567222..22dc83818e 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
@@ -493,6 +493,12 @@ public final class CastPlayer extends BasePlayer {
     return playbackParameters.value;
   }
 
+  @Override
+  public void stop() {
+    stop(/* reset= */ false);
+  }
+
+  @Deprecated
   @Override
   public void stop(boolean reset) {
     playbackState = STATE_IDLE;
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 02aa2527ae..da2e31d1d5 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
@@ -227,11 +227,6 @@ public abstract class BasePlayer implements Player {
     setPlaybackParameters(getPlaybackParameters().withSpeed(speed));
   }
 
-  @Override
-  public final void stop() {
-    stop(/* reset= */ false);
-  }
-
   @Override
   public final int getNextWindowIndex() {
     Timeline timeline = getCurrentTimeline();
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 2692475719..c91d0b746a 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
@@ -738,6 +738,12 @@ import java.util.concurrent.CopyOnWriteArraySet;
     }
   }
 
+  @Override
+  public void stop() {
+    stop(/* reset= */ false);
+  }
+
+  @Deprecated
   @Override
   public void stop(boolean reset) {
     stop(reset, /* error= */ null);
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 480ca348fc..00a5d66be0 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
@@ -1378,6 +1378,11 @@ public class SimpleExoPlayer extends BasePlayer
     player.setForegroundMode(foregroundMode);
   }
 
+  @Override
+  public void stop() {
+    stop(/* reset= */ false);
+  }
+
   @Deprecated
   @Override
   public void stop(boolean reset) {
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 f37bf72a78..72efc2b81b 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
@@ -416,6 +416,12 @@ public class StubExoPlayer extends BasePlayer implements ExoPlayer {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public void stop() {
+    throw new UnsupportedOperationException();
+  }
+
+  @Deprecated
   @Override
   public void stop(boolean reset) {
     throw new UnsupportedOperationException();