make MediaSessionConnector depend only to the Player interface

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162604746

extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/RepeatModeActionProvider.java

@@ -18,7 +18,6 @@ package com.google.android.exoplayer2.ext.mediasession;
 import android.content.Context;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Bundle;
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 
 
@@ -32,7 +31,7 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
   private static final int DEFAULT_REPEAT_MODES = RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE
   private static final int DEFAULT_REPEAT_MODES = RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE
       | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
       | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
 
 
-  private final ExoPlayer player;
+  private final Player player;
   @RepeatModeUtil.RepeatToggleModes
   @RepeatModeUtil.RepeatToggleModes
   private final int repeatToggleModes;
   private final int repeatToggleModes;
   private final CharSequence repeatAllDescription;
   private final CharSequence repeatAllDescription;
@@ -48,7 +47,7 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
    * @param context The context.
    * @param context The context.
    * @param player The player on which to toggle the repeat mode.
    * @param player The player on which to toggle the repeat mode.
    */
    */
-  public RepeatModeActionProvider(Context context, ExoPlayer player) {
+  public RepeatModeActionProvider(Context context, Player player) {
     this(context, player, DEFAULT_REPEAT_MODES);
     this(context, player, DEFAULT_REPEAT_MODES);
   }
   }
 
 
@@ -59,7 +58,7 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
    * @param player The player on which to toggle the repeat mode.
    * @param player The player on which to toggle the repeat mode.
    * @param repeatToggleModes The toggle modes to enable.
    * @param repeatToggleModes The toggle modes to enable.
    */
    */
-  public RepeatModeActionProvider(Context context, ExoPlayer player,
+  public RepeatModeActionProvider(Context context, Player player,
       @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
       @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
     this.player = player;
     this.player = player;
     this.repeatToggleModes = repeatToggleModes;
     this.repeatToggleModes = repeatToggleModes;

extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java

@@ -20,7 +20,7 @@ import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import android.support.v4.media.session.PlaybackStateCompat;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.util.Util;
 
 
@@ -30,7 +30,7 @@ import java.util.List;
 
 
 /**
 /**
  * An abstract implementation of the {@link MediaSessionConnector.QueueNavigator} that's based on an
  * An abstract implementation of the {@link MediaSessionConnector.QueueNavigator} that's based on an
- * {@link ExoPlayer}'s current {@link Timeline} and maps the timeline of the player to the media
+ * {@link Player}'s current {@link Timeline} and maps the timeline of the player to the media
  * session queue.
  * session queue.
  */
  */
 public abstract class TimelineQueueNavigator implements MediaSessionConnector.QueueNavigator {
 public abstract class TimelineQueueNavigator implements MediaSessionConnector.QueueNavigator {
@@ -87,22 +87,22 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
   }
 
 
   @Override
   @Override
-  public void onTimelineChanged(ExoPlayer player) {
+  public void onTimelineChanged(Player player) {
     publishFloatingQueueWindow(player);
     publishFloatingQueueWindow(player);
   }
   }
 
 
   @Override
   @Override
-  public void onCurrentWindowIndexChanged(ExoPlayer player) {
+  public void onCurrentWindowIndexChanged(Player player) {
     publishFloatingQueueWindow(player);
     publishFloatingQueueWindow(player);
   }
   }
 
 
   @Override
   @Override
-  public final long getActiveQueueItemId(@Nullable ExoPlayer player) {
+  public final long getActiveQueueItemId(@Nullable Player player) {
     return activeQueueItemId;
     return activeQueueItemId;
   }
   }
 
 
   @Override
   @Override
-  public final void onSkipToPrevious(ExoPlayer player) {
+  public final void onSkipToPrevious(Player player) {
     Timeline timeline = player.getCurrentTimeline();
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty()) {
     if (timeline.isEmpty()) {
       return;
       return;
@@ -118,7 +118,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
   }
 
 
   @Override
   @Override
-  public final void onSkipToQueueItem(ExoPlayer player, long id) {
+  public final void onSkipToQueueItem(Player player, long id) {
     Timeline timeline = player.getCurrentTimeline();
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty()) {
     if (timeline.isEmpty()) {
       return;
       return;
@@ -130,7 +130,7 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
   }
 
 
   @Override
   @Override
-  public final void onSkipToNext(ExoPlayer player) {
+  public final void onSkipToNext(Player player) {
     Timeline timeline = player.getCurrentTimeline();
     Timeline timeline = player.getCurrentTimeline();
     if (timeline.isEmpty()) {
     if (timeline.isEmpty()) {
       return;
       return;
@@ -143,11 +143,11 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   }
   }
 
 
   @Override
   @Override
-  public void onSetShuffleModeEnabled(ExoPlayer player, boolean enabled) {
+  public void onSetShuffleModeEnabled(Player player, boolean enabled) {
     // TODO: Implement this.
     // TODO: Implement this.
   }
   }
 
 
-  private void publishFloatingQueueWindow(ExoPlayer player) {
+  private void publishFloatingQueueWindow(Player player) {
     if (player.getCurrentTimeline().isEmpty()) {
     if (player.getCurrentTimeline().isEmpty()) {
       mediaSession.setQueue(Collections.<MediaSessionCompat.QueueItem>emptyList());
       mediaSession.setQueue(Collections.<MediaSessionCompat.QueueItem>emptyList());
       activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;
       activeQueueItemId = MediaSessionCompat.QueueItem.UNKNOWN_ID;