From 1b1e0f890da4de6055491730595f72afdde0811a Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 12 Jul 2022 14:06:27 +0000
Subject: [PATCH] Group COMMAND_SET_MEDIA_ITEM and COMMAND_CHANGE_MEDIA_ITEMS
 together

I don't think it's useful to keep these in numerical order, it makes
more sense to keep them grouped into a 'logical' ordering.

#minor-release

PiperOrigin-RevId: 460453464
---
 .../google/android/exoplayer2/ext/cast/CastPlayer.java    | 4 ++--
 .../main/java/com/google/android/exoplayer2/Player.java   | 8 ++++----
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java | 4 ++--
 3 files changed, 8 insertions(+), 8 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 9a6c9834cc8..560a592ff03 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
@@ -99,9 +99,9 @@ public final class CastPlayer extends BasePlayer {
               COMMAND_GET_TIMELINE,
               COMMAND_GET_MEDIA_ITEMS_METADATA,
               COMMAND_SET_MEDIA_ITEMS_METADATA,
+              COMMAND_SET_MEDIA_ITEM,
               COMMAND_CHANGE_MEDIA_ITEMS,
-              COMMAND_GET_TRACKS,
-              COMMAND_SET_MEDIA_ITEM)
+              COMMAND_GET_TRACKS)
           .build();
 
   public static final float MIN_SPEED_SUPPORTED = 0.5f;
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/Player.java b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
index 112a75b3721..0f3bd0b7e95 100644
--- a/library/common/src/main/java/com/google/android/exoplayer2/Player.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/Player.java
@@ -372,6 +372,7 @@ public static final class Builder {
         COMMAND_GET_TIMELINE,
         COMMAND_GET_MEDIA_ITEMS_METADATA,
         COMMAND_SET_MEDIA_ITEMS_METADATA,
+        COMMAND_SET_MEDIA_ITEM,
         COMMAND_CHANGE_MEDIA_ITEMS,
         COMMAND_GET_AUDIO_ATTRIBUTES,
         COMMAND_GET_VOLUME,
@@ -383,7 +384,6 @@ public static final class Builder {
         COMMAND_GET_TEXT,
         COMMAND_SET_TRACK_SELECTION_PARAMETERS,
         COMMAND_GET_TRACKS,
-        COMMAND_SET_MEDIA_ITEM,
       };
 
       private final FlagSet.Builder flagsBuilder;
@@ -1422,6 +1422,7 @@ default void onMetadata(Metadata metadata) {}
     COMMAND_GET_TIMELINE,
     COMMAND_GET_MEDIA_ITEMS_METADATA,
     COMMAND_SET_MEDIA_ITEMS_METADATA,
+    COMMAND_SET_MEDIA_ITEM,
     COMMAND_CHANGE_MEDIA_ITEMS,
     COMMAND_GET_AUDIO_ATTRIBUTES,
     COMMAND_GET_VOLUME,
@@ -1433,7 +1434,6 @@ default void onMetadata(Metadata metadata) {}
     COMMAND_GET_TEXT,
     COMMAND_SET_TRACK_SELECTION_PARAMETERS,
     COMMAND_GET_TRACKS,
-    COMMAND_SET_MEDIA_ITEM,
   })
   @interface Command {}
   /** Command to start, pause or resume playback. */
@@ -1490,6 +1490,8 @@ default void onMetadata(Metadata metadata) {}
   int COMMAND_GET_MEDIA_ITEMS_METADATA = 18;
   /** Command to set the {@link MediaItem MediaItems} metadata. */
   int COMMAND_SET_MEDIA_ITEMS_METADATA = 19;
+  /** Command to set a {@link MediaItem MediaItem}. */
+  int COMMAND_SET_MEDIA_ITEM = 31;
   /** Command to change the {@link MediaItem MediaItems} in the playlist. */
   int COMMAND_CHANGE_MEDIA_ITEMS = 20;
   /** Command to get the player current {@link AudioAttributes}. */
@@ -1512,8 +1514,6 @@ default void onMetadata(Metadata metadata) {}
   int COMMAND_SET_TRACK_SELECTION_PARAMETERS = 29;
   /** Command to get details of the current track selection. */
   int COMMAND_GET_TRACKS = 30;
-  /** Command to set a {@link MediaItem MediaItem}. */
-  int COMMAND_SET_MEDIA_ITEM = 31;
 
   /** Represents an invalid {@link Command}. */
   int COMMAND_INVALID = -1;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
index d9583341ffa..9c67002a549 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java
@@ -283,6 +283,7 @@ public ExoPlayerImpl(ExoPlayer.Builder builder, @Nullable Player wrappingPlayer)
                   COMMAND_GET_TIMELINE,
                   COMMAND_GET_MEDIA_ITEMS_METADATA,
                   COMMAND_SET_MEDIA_ITEMS_METADATA,
+                  COMMAND_SET_MEDIA_ITEM,
                   COMMAND_CHANGE_MEDIA_ITEMS,
                   COMMAND_GET_TRACKS,
                   COMMAND_GET_AUDIO_ATTRIBUTES,
@@ -292,8 +293,7 @@ public ExoPlayerImpl(ExoPlayer.Builder builder, @Nullable Player wrappingPlayer)
                   COMMAND_SET_DEVICE_VOLUME,
                   COMMAND_ADJUST_DEVICE_VOLUME,
                   COMMAND_SET_VIDEO_SURFACE,
-                  COMMAND_GET_TEXT,
-                  COMMAND_SET_MEDIA_ITEM)
+                  COMMAND_GET_TEXT)
               .addIf(
                   COMMAND_SET_TRACK_SELECTION_PARAMETERS, trackSelector.isSetParametersSupported())
               .build();