From 0831f6cab36d8607fa63a6dcac5a17abead75c90 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 17 Aug 2018 08:26:41 -0700
Subject: [PATCH] Remove deprecated usage of MediaSession APIs

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209152304
---
 .../google/android/exoplayer2/ext/cast/CastPlayer.java   | 1 -
 .../ext/mediasession/MediaSessionConnector.java          | 9 ---------
 .../exoplayer2/ext/mediasession/TimelineQueueEditor.java | 9 ++-------
 3 files changed, 2 insertions(+), 17 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 21e853dd62..f3e66315b4 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
@@ -839,7 +839,6 @@ public final class CastPlayer implements Player {
     @Override
     public void onAdBreakStatusUpdated() {}
 
-
     // SessionManagerListener implementation.
 
     @Override
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index c3d6a13f46..f1d3e8fbd0 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -248,8 +248,6 @@ public final class MediaSessionConnector {
      * description)}.
      */
     void onRemoveQueueItem(Player player, MediaDescriptionCompat description);
-    /** See {@link MediaSessionCompat.Callback#onRemoveQueueItemAt(int index)}. */
-    void onRemoveQueueItemAt(Player player, int index);
   }
 
   /** Callback receiving a user rating for the active media item. */
@@ -1022,12 +1020,5 @@ public final class MediaSessionConnector {
         queueEditor.onRemoveQueueItem(player, description);
       }
     }
-
-    @Override
-    public void onRemoveQueueItemAt(int index) {
-      if (queueEditor != null) {
-        queueEditor.onRemoveQueueItemAt(player, index);
-      }
-    }
   }
 }
diff --git a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index eadb320941..4f9c553a15 100644
--- a/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -184,18 +184,13 @@ public final class TimelineQueueEditor
     List<MediaSessionCompat.QueueItem> queue = mediaController.getQueue();
     for (int i = 0; i < queue.size(); i++) {
       if (equalityChecker.equals(queue.get(i).getDescription(), description)) {
-        onRemoveQueueItemAt(player, i);
+        queueDataAdapter.remove(i);
+        queueMediaSource.removeMediaSource(i);
         return;
       }
     }
   }
 
-  @Override
-  public void onRemoveQueueItemAt(Player player, int index) {
-    queueDataAdapter.remove(index);
-    queueMediaSource.removeMediaSource(index);
-  }
-
   // CommandReceiver implementation.
 
   @NonNull