From 13dc59fc0fef2574a5fffcd30caeeaeb91f5d6c8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 16 Jan 2023 11:16:03 +0000
Subject: [PATCH] Correctly map deprecated methods in MediaController to
 replacement

This avoids throwing exceptions for correct (but deprecated) Player
method invocations.

PiperOrigin-RevId: 502341428
(cherry picked from commit 86a95c2a4afd861986376f9dc31e0d65910e6e74)
---
 .../media3/session/MediaController.java       | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

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 e9855421d6..529be85dcc 100644
--- a/libraries/session/src/main/java/androidx/media3/session/MediaController.java
+++ b/libraries/session/src/main/java/androidx/media3/session/MediaController.java
@@ -478,7 +478,10 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public void stop(boolean reset) {
-    throw new UnsupportedOperationException();
+    stop();
+    if (reset) {
+      clearMediaItems();
+    }
   }
 
   /**
@@ -1174,7 +1177,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean isCurrentWindowDynamic() {
-    throw new UnsupportedOperationException();
+    return isCurrentMediaItemDynamic();
   }
 
   @Override
@@ -1191,7 +1194,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean isCurrentWindowLive() {
-    throw new UnsupportedOperationException();
+    return isCurrentMediaItemLive();
   }
 
   @Override
@@ -1208,7 +1211,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean isCurrentWindowSeekable() {
-    throw new UnsupportedOperationException();
+    return isCurrentMediaItemSeekable();
   }
 
   @Override
@@ -1260,7 +1263,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public int getCurrentWindowIndex() {
-    throw new UnsupportedOperationException();
+    return getCurrentMediaItemIndex();
   }
 
   @Override
@@ -1276,7 +1279,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public int getPreviousWindowIndex() {
-    throw new UnsupportedOperationException();
+    return getPreviousMediaItemIndex();
   }
 
   /**
@@ -1299,7 +1302,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public int getNextWindowIndex() {
-    throw new UnsupportedOperationException();
+    return getNextMediaItemIndex();
   }
 
   /**
@@ -1322,7 +1325,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean hasPrevious() {
-    throw new UnsupportedOperationException();
+    return hasPreviousMediaItem();
   }
 
   /**
@@ -1332,7 +1335,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean hasNext() {
-    throw new UnsupportedOperationException();
+    return hasNextMediaItem();
   }
 
   /**
@@ -1342,7 +1345,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean hasPreviousWindow() {
-    throw new UnsupportedOperationException();
+    return hasPreviousMediaItem();
   }
 
   /**
@@ -1352,7 +1355,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public boolean hasNextWindow() {
-    throw new UnsupportedOperationException();
+    return hasNextMediaItem();
   }
 
   @Override
@@ -1374,7 +1377,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public void previous() {
-    throw new UnsupportedOperationException();
+    seekToPreviousMediaItem();
   }
 
   /**
@@ -1384,7 +1387,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public void next() {
-    throw new UnsupportedOperationException();
+    seekToNextMediaItem();
   }
 
   /**
@@ -1394,7 +1397,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public void seekToPreviousWindow() {
-    throw new UnsupportedOperationException();
+    seekToPreviousMediaItem();
   }
 
   /**
@@ -1420,7 +1423,7 @@ public class MediaController implements Player {
   @Deprecated
   @Override
   public void seekToNextWindow() {
-    throw new UnsupportedOperationException();
+    seekToNextMediaItem();
   }
 
   /**