Extend command GET_CURRENT_MEDIA_ITEM to more methods.

We currently only document it for the getCurrentMediaItem(), but
the command was always meant to cover all information about the
current media item and the position therein.

To correctly hide information for controllers, we need to filter
the Timeline when bundling the PlayerInfo class if only this
command is available.

PiperOrigin-RevId: 503098124
(cherry picked from commit f15b752)

Author: tonihei

libraries/common/src/main/java/androidx/media3/common/Player.java

@@ -1625,10 +1625,28 @@ default void onMetadata(Metadata metadata) {}
   int COMMAND_SET_REPEAT_MODE = 15;
 
   /**
-   * Command to get the currently playing {@link MediaItem}.
+   * Command to get information about the currently playing {@link MediaItem}.
    *
-   * The {@link #getCurrentMediaItem()} method must only be called if this command is {@linkplain
-   * #isCommandAvailable(int) available}.
+   * The following methods must only be called if this command is {@linkplain
+   * #isCommandAvailable(int) available}:
+   *
+   * 
+   *   {@link #getCurrentMediaItem()}
+   *   {@link #isCurrentMediaItemDynamic()}
+   *   {@link #isCurrentMediaItemLive()}
+   *   {@link #isCurrentMediaItemSeekable()}
+   *   {@link #getCurrentLiveOffset()}
+   *   {@link #getDuration()}
+   *   {@link #getCurrentPosition()}
+   *   {@link #getBufferedPosition()}
+   *   {@link #getContentDuration()}
+   *   {@link #getContentPosition()}
+   *   {@link #getContentBufferedPosition()}
+   *   {@link #getTotalBufferedDuration()}
+   *   {@link #isPlayingAd()}
+   *   {@link #getCurrentAdGroupIndex()}
+   *   {@link #getCurrentAdIndexInAdGroup()}
+   * 
    */
   int COMMAND_GET_CURRENT_MEDIA_ITEM = 16;
 
@@ -1648,8 +1666,6 @@ default void onMetadata(Metadata metadata) {}
    *   {@link #getPreviousMediaItemIndex()}
    *   {@link #hasPreviousMediaItem()}
    *   {@link #hasNextMediaItem()}
-   *   {@link #getCurrentAdGroupIndex()}
-   *   {@link #getCurrentAdIndexInAdGroup()}
    * 
    */
   int COMMAND_GET_TIMELINE = 17;
@@ -2692,18 +2708,27 @@ default void onMetadata(Metadata metadata) {}
   /**
    * Returns the duration of the current content or ad in milliseconds, or {@link C#TIME_UNSET} if
    * the duration is not known.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getDuration();
 
   /**
    * Returns the playback position in the current content or ad, in milliseconds, or the prospective
    * position in milliseconds if the {@link #getCurrentTimeline() current timeline} is empty.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getCurrentPosition();
 
   /**
    * Returns an estimate of the position in the current content or ad up to which data is buffered,
    * in milliseconds.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getBufferedPosition();
 
@@ -2717,6 +2742,9 @@ default void onMetadata(Metadata metadata) {}
   /**
    * Returns an estimate of the total buffered duration from the current position, in milliseconds.
    * This includes pre-buffered data for subsequent ads and {@linkplain MediaItem media items}.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getTotalBufferedDuration();
 
@@ -2731,6 +2759,9 @@ default void onMetadata(Metadata metadata) {}
    * Returns whether the current {@link MediaItem} is dynamic (may change when the {@link Timeline}
    * is updated), or {@code false} if the {@link Timeline} is empty.
    *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
+   *
    * @see Timeline.Window#isDynamic
    */
   boolean isCurrentMediaItemDynamic();
@@ -2746,6 +2777,9 @@ default void onMetadata(Metadata metadata) {}
    * Returns whether the current {@link MediaItem} is live, or {@code false} if the {@link Timeline}
    * is empty.
    *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
+   *
    * @see Timeline.Window#isLive()
    */
   boolean isCurrentMediaItemLive();
@@ -2760,6 +2794,9 @@ default void onMetadata(Metadata metadata) {}
    *
    * Note that this offset may rely on an accurate local time, so this method may return an
    * incorrect value if the difference between system clock and server clock is unknown.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getCurrentLiveOffset();
 
@@ -2774,18 +2811,26 @@ default void onMetadata(Metadata metadata) {}
    * Returns whether the current {@link MediaItem} is seekable, or {@code false} if the {@link
    * Timeline} is empty.
    *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
+   *
    * @see Timeline.Window#isSeekable
    */
   boolean isCurrentMediaItemSeekable();
 
-  /** Returns whether the player is currently playing an ad. */
+  /**
+   * Returns whether the player is currently playing an ad.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
+   */
   boolean isPlayingAd();
 
   /**
    * If {@link #isPlayingAd()} returns true, returns the index of the ad group in the period
    * currently being played. Returns {@link C#INDEX_UNSET} otherwise.
    *
-   * This method must only be called if {@link #COMMAND_GET_TIMELINE} is {@linkplain
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
    * #getAvailableCommands() available}.
    */
   int getCurrentAdGroupIndex();
@@ -2794,7 +2839,7 @@ default void onMetadata(Metadata metadata) {}
    * If {@link #isPlayingAd()} returns true, returns the index of the ad in its ad group. Returns
    * {@link C#INDEX_UNSET} otherwise.
    *
-   * This method must only be called if {@link #COMMAND_GET_TIMELINE} is {@linkplain
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
    * #getAvailableCommands() available}.
    */
   int getCurrentAdIndexInAdGroup();
@@ -2803,20 +2848,29 @@ default void onMetadata(Metadata metadata) {}
    * If {@link #isPlayingAd()} returns {@code true}, returns the duration of the current content in
    * milliseconds, or {@link C#TIME_UNSET} if the duration is not known. If there is no ad playing,
    * the returned duration is the same as that returned by {@link #getDuration()}.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getContentDuration();
 
   /**
    * If {@link #isPlayingAd()} returns {@code true}, returns the content position that will be
    * played once all ads in the ad group have finished playing, in milliseconds. If there is no ad
    * playing, the returned position is the same as that returned by {@link #getCurrentPosition()}.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getContentPosition();
 
   /**
    * If {@link #isPlayingAd()} returns {@code true}, returns an estimate of the content position in
    * the current content up to which data is buffered, in milliseconds. If there is no ad playing,
    * the returned position is the same as that returned by {@link #getBufferedPosition()}.
+   *
+   * This method must only be called if {@link #COMMAND_GET_CURRENT_MEDIA_ITEM} is {@linkplain
+   * #getAvailableCommands() available}.
    */
   long getContentBufferedPosition();
 

libraries/common/src/main/java/androidx/media3/common/Timeline.java

@@ -1416,6 +1416,39 @@ public final Bundle toBundle() {
     return bundle;
   }
 
+  /**
+   * Returns a {@link Bundle} containing just the specified {@link Window}.
+   *
+   * The {@link #getWindow(int, Window)} windows} and {@link #getPeriod(int, Period) periods} of
+   * an instance restored by {@link #CREATOR} may have missing fields as described in {@link
+   * Window#toBundle()} and {@link Period#toBundle()}.
+   *
+   * @param windowIndex The index of the {@link Window} to include in the {@link Bundle}.
+   */
+  @UnstableApi
+  public final Bundle toBundleWithOneWindowOnly(int windowIndex) {
+    Window window = getWindow(windowIndex, new Window(), /* defaultPositionProjectionUs= */ 0);
+
+    List<Bundle> periodBundles = new ArrayList<>();
+    Period period = new Period();
+    for (int i = window.firstPeriodIndex; i <= window.lastPeriodIndex; i++) {
+      getPeriod(i, period, /* setIds= */ false);
+      period.windowIndex = 0;
+      periodBundles.add(period.toBundle());
+    }
+
+    window.lastPeriodIndex = window.lastPeriodIndex - window.firstPeriodIndex;
+    window.firstPeriodIndex = 0;
+    Bundle windowBundle = window.toBundle();
+
+    Bundle bundle = new Bundle();
+    BundleUtil.putBinder(
+        bundle, FIELD_WINDOWS, new BundleListRetriever(ImmutableList.of(windowBundle)));
+    BundleUtil.putBinder(bundle, FIELD_PERIODS, new BundleListRetriever(periodBundles));
+    bundle.putIntArray(FIELD_SHUFFLED_WINDOW_INDICES, new int[] {0});
+    return bundle;
+  }
+
   /**
    * Object that can restore a {@link Timeline} from a {@link Bundle}.
    *

libraries/session/src/main/java/androidx/media3/session/MediaSessionImpl.java

@@ -810,8 +810,6 @@ public void onMediaItemTransition(
       if (player == null) {
         return;
       }
-      // Note: OK to omit mediaItem here, because PlayerInfo changed message will copy playerInfo
-      //       with sessionPositionInfo, which includes current window index.
       session.playerInfo = session.playerInfo.copyWithMediaItemTransitionReason(reason);
       session.onPlayerInfoChangedHandler.sendPlayerInfoChangedMessage(
           /* excludeTimeline= */ true, /* excludeTracks= */ true);