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 2b4409e0fb..544644d03b 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
@@ -105,23 +105,24 @@ public final class MediaSessionConnector {
    */
   public interface PlaybackPreparer extends CommandReceiver {
 
-    long ACTIONS = PlaybackStateCompat.ACTION_PREPARE
-        | PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID
-        | PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH
-        | PlaybackStateCompat.ACTION_PREPARE_FROM_URI
-        | PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID
-        | PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH
-        | PlaybackStateCompat.ACTION_PLAY_FROM_URI;
+    long ACTIONS =
+        PlaybackStateCompat.ACTION_PREPARE
+            | PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID
+            | PlaybackStateCompat.ACTION_PREPARE_FROM_SEARCH
+            | PlaybackStateCompat.ACTION_PREPARE_FROM_URI
+            | PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID
+            | PlaybackStateCompat.ACTION_PLAY_FROM_SEARCH
+            | PlaybackStateCompat.ACTION_PLAY_FROM_URI;
 
     /**
      * Returns the actions which are supported by the preparer. The supported actions must be a
-     * bitmask combined out of {@link PlaybackStateCompat#ACTION_PREPARE},
-     * {@link PlaybackStateCompat#ACTION_PREPARE_FROM_MEDIA_ID},
-     * {@link PlaybackStateCompat#ACTION_PREPARE_FROM_SEARCH},
-     * {@link PlaybackStateCompat#ACTION_PREPARE_FROM_URI},
-     * {@link PlaybackStateCompat#ACTION_PLAY_FROM_MEDIA_ID},
-     * {@link PlaybackStateCompat#ACTION_PLAY_FROM_SEARCH} and
-     * {@link PlaybackStateCompat#ACTION_PLAY_FROM_URI}.
+     * bitmask combined out of {@link PlaybackStateCompat#ACTION_PREPARE}, {@link
+     * PlaybackStateCompat#ACTION_PREPARE_FROM_MEDIA_ID}, {@link
+     * PlaybackStateCompat#ACTION_PREPARE_FROM_SEARCH}, {@link
+     * PlaybackStateCompat#ACTION_PREPARE_FROM_URI}, {@link
+     * PlaybackStateCompat#ACTION_PLAY_FROM_MEDIA_ID}, {@link
+     * PlaybackStateCompat#ACTION_PLAY_FROM_SEARCH} and {@link
+     * PlaybackStateCompat#ACTION_PLAY_FROM_URI}.
      *
      * @return The bitmask of the supported media actions.
      */
@@ -264,15 +265,6 @@ public final class MediaSessionConnector {
    */
   public interface QueueEditor extends CommandReceiver {
 
-    long ACTIONS = PlaybackStateCompat.ACTION_SET_RATING;
-
-    /**
-     * Returns {@link PlaybackStateCompat#ACTION_SET_RATING} or {@code 0}. The Media API does
-     * not declare action constants for adding and removing queue items.
-     *
-     * @param player The {@link Player}.
-     */
-    long getSupportedQueueEditorActions(@Nullable Player player);
     /**
      * See {@link MediaSessionCompat.Callback#onAddQueueItem(MediaDescriptionCompat description)}.
      */
@@ -291,9 +283,14 @@ public final class MediaSessionConnector {
      * See {@link MediaSessionCompat.Callback#onRemoveQueueItemAt(int index)}.
      */
     void onRemoveQueueItemAt(Player player, int index);
-    /**
-     * See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}.
-     */
+  }
+
+  /** Callback receiving a user rating for the active media item. */
+  public interface RatingCallback extends CommandReceiver {
+
+    long ACTIONS = PlaybackStateCompat.ACTION_SET_RATING;
+
+    /** See {@link MediaSessionCompat.Callback#onSetRating(RatingCompat)}. */
     void onSetRating(Player player, RatingCompat rating);
   }
 
@@ -341,6 +338,7 @@ public final class MediaSessionConnector {
   private PlaybackPreparer playbackPreparer;
   private QueueNavigator queueNavigator;
   private QueueEditor queueEditor;
+  private RatingCallback ratingCallback;
   private ExoPlaybackException playbackException;
 
   /**
@@ -471,6 +469,17 @@ public final class MediaSessionConnector {
         : EDITOR_MEDIA_SESSION_FLAGS);
   }
 
+  /**
+   * Sets the {@link RatingCallback} to handle user ratings.
+   *
+   * @param ratingCallback The rating callback.
+   */
+  public void setRatingCallback(RatingCallback ratingCallback) {
+    unregisterCommandReceiver(this.ratingCallback);
+    this.ratingCallback = ratingCallback;
+    registerCommandReceiver(this.ratingCallback);
+  }
+
   private void registerCommandReceiver(CommandReceiver commandReceiver) {
     if (commandReceiver != null && commandReceiver.getCommands() != null) {
       for (String command : commandReceiver.getCommands()) {
@@ -539,8 +548,8 @@ public final class MediaSessionConnector {
       actions |= (QueueNavigator.ACTIONS & queueNavigator.getSupportedQueueNavigatorActions(
           player));
     }
-    if (queueEditor != null) {
-      actions |= (QueueEditor.ACTIONS & queueEditor.getSupportedQueueEditorActions(player));
+    if (ratingCallback != null) {
+      actions |= RatingCallback.ACTIONS;
     }
     return actions;
   }
@@ -634,6 +643,10 @@ public final class MediaSessionConnector {
         & PlaybackPreparer.ACTIONS & action) != 0;
   }
 
+  private boolean canDispatchToRatingCallback(long action) {
+    return ratingCallback != null && (RatingCallback.ACTIONS & action) != 0;
+  }
+
   private boolean canDispatchToPlaybackController(long action) {
     return (playbackController.getSupportedPlaybackActions(player)
         & PlaybackController.ACTIONS & action) != 0;
@@ -644,11 +657,6 @@ public final class MediaSessionConnector {
         & QueueNavigator.ACTIONS & action) != 0;
   }
 
-  private boolean canDispatchToQueueEditor(long action) {
-    return queueEditor != null && (queueEditor.getSupportedQueueEditorActions(player)
-        & QueueEditor.ACTIONS & action) != 0;
-  }
-
   private class ExoPlayerEventListener extends Player.DefaultEventListener {
 
     private int currentWindowIndex;
@@ -879,6 +887,13 @@ public final class MediaSessionConnector {
       }
     }
 
+    @Override
+    public void onSetRating(RatingCompat rating) {
+      if (canDispatchToRatingCallback(PlaybackStateCompat.ACTION_SET_RATING)) {
+        ratingCallback.onSetRating(player, rating);
+      }
+    }
+
     @Override
     public void onAddQueueItem(MediaDescriptionCompat description) {
       if (queueEditor != null) {
@@ -907,13 +922,6 @@ public final class MediaSessionConnector {
       }
     }
 
-    @Override
-    public void onSetRating(RatingCompat rating) {
-      if (canDispatchToQueueEditor(PlaybackStateCompat.ACTION_SET_RATING)) {
-        queueEditor.onSetRating(player, rating);
-      }
-    }
-
   }
 
 }
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 048bd70640..853750077d 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
@@ -20,7 +20,6 @@ import android.os.ResultReceiver;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.RatingCompat;
 import android.support.v4.media.session.MediaControllerCompat;
 import android.support.v4.media.session.MediaSessionCompat;
 import com.google.android.exoplayer2.C;
@@ -166,11 +165,6 @@ public final class TimelineQueueEditor
     this.equalityChecker = equalityChecker;
   }
 
-  @Override
-  public long getSupportedQueueEditorActions(@Nullable Player player) {
-    return 0;
-  }
-
   @Override
   public void onAddQueueItem(Player player, MediaDescriptionCompat description) {
     onAddQueueItem(player, description, player.getCurrentTimeline().getWindowCount());
@@ -202,11 +196,6 @@ public final class TimelineQueueEditor
     queueMediaSource.removeMediaSource(index);
   }
 
-  @Override
-  public void onSetRating(Player player, RatingCompat rating) {
-    // Do nothing.
-  }
-
   // CommandReceiver implementation.
 
   @NonNull