From 47b1ca18ed248d451820756cc78e671cd34cef27 Mon Sep 17 00:00:00 2001
From: ktrajkovski <ktrajkovski@google.com>
Date: Thu, 27 Jun 2024 09:01:28 -0700
Subject: [PATCH] Remove deprecated Player#hasPrevious() method.

Use Player#hasPreviousMediaItem() instead.

#cherrypick

PiperOrigin-RevId: 647336042
---
 RELEASENOTES.md                                      |  2 ++
 .../main/java/androidx/media3/common/BasePlayer.java |  9 ---------
 .../androidx/media3/common/ForwardingPlayer.java     | 12 ------------
 .../src/main/java/androidx/media3/common/Player.java |  7 -------
 .../androidx/media3/session/MediaController.java     | 10 ----------
 .../java/androidx/media3/session/PlayerWrapper.java  |  8 --------
 .../java/androidx/media3/session/MockPlayer.java     |  9 ---------
 7 files changed, 2 insertions(+), 55 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index eaf56bab1a..34058b8916 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -57,6 +57,8 @@
     *   Use `HttpEngineDataSource` as the `HttpDataSource` when supported by the
         device.
 *   Remove deprecated symbols:
+    *   Remove deprecated `Player#hasPrevious` method. Use
+        `Player#hasPreviousMediaItem()` instead.
 
 ## 1.4
 
diff --git a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java
index 31036bf9fb..7b4edba10f 100644
--- a/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java
+++ b/libraries/common/src/main/java/androidx/media3/common/BasePlayer.java
@@ -147,15 +147,6 @@ public abstract class BasePlayer implements Player {
     seekToOffset(getSeekForwardIncrement(), Player.COMMAND_SEEK_FORWARD);
   }
 
-  /**
-   * @deprecated Use {@link #hasPreviousMediaItem()} instead.
-   */
-  @Deprecated
-  @Override
-  public final boolean hasPrevious() {
-    return hasPreviousMediaItem();
-  }
-
   /**
    * @deprecated Use {@link #hasPreviousMediaItem()} instead.
    */
diff --git a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java
index 4092cc15a9..23d85f4737 100644
--- a/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java
+++ b/libraries/common/src/main/java/androidx/media3/common/ForwardingPlayer.java
@@ -327,18 +327,6 @@ public class ForwardingPlayer implements Player {
     player.seekForward();
   }
 
-  /**
-   * Calls {@link Player#hasPrevious()} on the delegate and returns the result.
-   *
-   * @deprecated Use {@link #hasPreviousMediaItem()} instead.
-   */
-  @SuppressWarnings("deprecation") // Forwarding to deprecated method
-  @Deprecated
-  @Override
-  public boolean hasPrevious() {
-    return player.hasPrevious();
-  }
-
   /**
    * Calls {@link Player#hasPreviousWindow()} on the delegate and returns the result.
    *
diff --git a/libraries/common/src/main/java/androidx/media3/common/Player.java b/libraries/common/src/main/java/androidx/media3/common/Player.java
index ffccdce19c..add2881769 100644
--- a/libraries/common/src/main/java/androidx/media3/common/Player.java
+++ b/libraries/common/src/main/java/androidx/media3/common/Player.java
@@ -2635,13 +2635,6 @@ public interface Player {
    */
   void seekForward();
 
-  /**
-   * @deprecated Use {@link #hasPreviousMediaItem()} instead.
-   */
-  @UnstableApi
-  @Deprecated
-  boolean hasPrevious();
-
   /**
    * @deprecated Use {@link #hasPreviousMediaItem()} instead.
    */
diff --git a/libraries/session/src/main/java/androidx/media3/session/MediaController.java b/libraries/session/src/main/java/androidx/media3/session/MediaController.java
index bb68ebc8ae..38f96e213d 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java
@@ -1427,16 +1427,6 @@ public class MediaController implements Player {
     return isConnected() ? impl.getNextMediaItemIndex() : C.INDEX_UNSET;
   }
 
-  /**
-   * @deprecated Use {@link #hasPreviousMediaItem()} instead.
-   */
-  @UnstableApi
-  @Deprecated
-  @Override
-  public final boolean hasPrevious() {
-    return hasPreviousMediaItem();
-  }
-
   /**
    * @deprecated Use {@link #hasNextMediaItem()} instead.
    */
diff --git a/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java b/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java
index 1e9ddc0eed..db99b29e46 100644
--- a/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java
+++ b/libraries/session/src/main/java/androidx/media3/session/PlayerWrapper.java
@@ -557,14 +557,6 @@ import java.util.List;
     super.replaceMediaItems(fromIndex, toIndex, mediaItems);
   }
 
-  @SuppressWarnings("deprecation") // Forwarding deprecated call
-  @Deprecated
-  @Override
-  public boolean hasPrevious() {
-    verifyApplicationThread();
-    return super.hasPrevious();
-  }
-
   @SuppressWarnings("deprecation") // Forwarding deprecated call
   @Deprecated
   @Override
diff --git a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java
index 3c38eb587c..b5b81e179e 100644
--- a/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java
+++ b/libraries/test_session_current/src/main/java/androidx/media3/session/MockPlayer.java
@@ -1080,15 +1080,6 @@ public class MockPlayer implements Player {
     checkNotNull(conditionVariables.get(METHOD_REPLACE_MEDIA_ITEMS)).open();
   }
 
-  /**
-   * @deprecated Use {@link #hasPreviousMediaItem()} instead.
-   */
-  @Deprecated
-  @Override
-  public boolean hasPrevious() {
-    throw new UnsupportedOperationException();
-  }
-
   /**
    * @deprecated Use {@link #hasNextMediaItem()} instead.
    */