Merge pull request #2522 from nift4:getshuffle

PiperOrigin-RevId: 781950733
(cherry picked from commit af6fa9e)

Author: copybara-github

RELEASENOTES.md

@@ -8,6 +8,8 @@ This release includes the following changes since the
 [1.8.0-rc01 release](#180-rc01-2025-07-16):
 
 *   ExoPlayer:
+    *   Add getter for shuffle mode to the `ExoPlayer` interface
+        ([#2522](https://github.com/androidx/media/pull/2522)).
     *   More clearly throw an exception if `DefaultAudioSink` is accessed from
         multiple threads. If this happens due to a call to
         `RendererCapabilities.getFormatSupport` outside of the player, make sure

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayer.java

@@ -1381,6 +1381,15 @@ void setMediaSources(
   @UnstableApi
   void setShuffleOrder(ShuffleOrder shuffleOrder);
 
+  /**
+   * Returns the shuffle order.
+   *
+   * <p>The {@link ShuffleOrder} returned will have the same length as the current playlist ({@link
+   * Player#getMediaItemCount()}).
+   */
+  @UnstableApi
+  ShuffleOrder getShuffleOrder();
+
   /**
    * Sets the {@linkplain PreloadConfiguration preload configuration} to configure playlist
    * preloading.

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/ExoPlayerImpl.java

@@ -786,6 +786,12 @@ public void setShuffleOrder(ShuffleOrder shuffleOrder) {
         /* repeatCurrentMediaItem= */ false);
   }
 
+  @Override
+  public ShuffleOrder getShuffleOrder() {
+    verifyApplicationThread();
+    return shuffleOrder;
+  }
+
   @Override
   public void setPauseAtEndOfMediaItems(boolean pauseAtEndOfMediaItems) {
     verifyApplicationThread();

libraries/exoplayer/src/main/java/androidx/media3/exoplayer/SimpleExoPlayer.java

@@ -929,6 +929,12 @@ public void setShuffleOrder(ShuffleOrder shuffleOrder) {
     player.setShuffleOrder(shuffleOrder);
   }
 
+  @Override
+  public ShuffleOrder getShuffleOrder() {
+    blockUntilConstructorFinished();
+    return player.getShuffleOrder();
+  }
+
   @Override
   public void setPlayWhenReady(boolean playWhenReady) {
     blockUntilConstructorFinished();

libraries/exoplayer/src/test/java/androidx/media3/exoplayer/ExoPlayerTest.java

@@ -8089,15 +8089,18 @@ public void run(ExoPlayer player) {
   @Test
   public void setShuffleOrder_keepsCurrentPosition() throws Exception {
     AtomicLong positionAfterSetShuffleOrder = new AtomicLong(C.TIME_UNSET);
+    AtomicReference<ShuffleOrder> shuffleOrderRef = new AtomicReference<>();
+    FakeShuffleOrder shuffleOrder = new FakeShuffleOrder(/* length= */ 1);
     ActionSchedule actionSchedule =
         new ActionSchedule.Builder(TAG)
             .playUntilPosition(0, 5000)
-            .setShuffleOrder(new FakeShuffleOrder(/* length= */ 1))
+            .setShuffleOrder(shuffleOrder)
             .executeRunnable(
                 new PlayerRunnable() {
                   @Override
                   public void run(ExoPlayer player) {
                     positionAfterSetShuffleOrder.set(player.getCurrentPosition());
+                    shuffleOrderRef.set(player.getShuffleOrder());
                   }
                 })
             .play()
@@ -8109,6 +8112,7 @@ public void run(ExoPlayer player) {
         .blockUntilEnded(TIMEOUT_MS);
 
     assertThat(positionAfterSetShuffleOrder.get()).isAtLeast(5000);
+    assertThat(shuffleOrderRef.get()).isEqualTo(shuffleOrder);
   }
 
   @Test

libraries/test_utils/src/main/java/androidx/media3/test/utils/StubExoPlayer.java

@@ -176,6 +176,11 @@ public void setShuffleOrder(ShuffleOrder shuffleOrder) {
     throw new UnsupportedOperationException();
   }
 
+  @Override
+  public ShuffleOrder getShuffleOrder() {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public void setAudioAttributes(AudioAttributes audioAttributes, boolean handleAudioFocus) {
     throw new UnsupportedOperationException();