Set duration in QueueTimeline

If the duration is reported in MediaMetadataCompat, it should
also be set in the QueueTimeline to match controller.getDuration()

PiperOrigin-RevId: 522022953

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

@@ -1804,6 +1804,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     long oldActiveQueueId = getActiveQueueId(oldLegacyPlayerInfo.playbackStateCompat);
     long oldActiveQueueId = getActiveQueueId(oldLegacyPlayerInfo.playbackStateCompat);
     long newActiveQueueId = getActiveQueueId(newLegacyPlayerInfo.playbackStateCompat);
     long newActiveQueueId = getActiveQueueId(newLegacyPlayerInfo.playbackStateCompat);
     boolean isCurrentActiveQueueIdChanged = (oldActiveQueueId != newActiveQueueId) || initialUpdate;
     boolean isCurrentActiveQueueIdChanged = (oldActiveQueueId != newActiveQueueId) || initialUpdate;
+    long durationMs = MediaUtils.convertToDurationMs(newLegacyPlayerInfo.mediaMetadataCompat);
     if (isMetadataCompatChanged || isCurrentActiveQueueIdChanged || isQueueChanged) {
     if (isMetadataCompatChanged || isCurrentActiveQueueIdChanged || isQueueChanged) {
       currentMediaItemIndex = findQueueItemIndex(newLegacyPlayerInfo.queue, newActiveQueueId);
       currentMediaItemIndex = findQueueItemIndex(newLegacyPlayerInfo.queue, newActiveQueueId);
       boolean hasMediaMetadataCompat = newLegacyPlayerInfo.mediaMetadataCompat != null;
       boolean hasMediaMetadataCompat = newLegacyPlayerInfo.mediaMetadataCompat != null;
@@ -1829,19 +1830,17 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
                   + " MediaItem.");
                   + " MediaItem.");
           MediaItem fakeMediaItem =
           MediaItem fakeMediaItem =
               MediaUtils.convertToMediaItem(newLegacyPlayerInfo.mediaMetadataCompat, ratingType);
               MediaUtils.convertToMediaItem(newLegacyPlayerInfo.mediaMetadataCompat, ratingType);
-          // Ad a tag to make sure the fake media item can't have an equal instance by accident.
-          fakeMediaItem = fakeMediaItem.buildUpon().setTag(new Object()).build();
-          currentTimeline = currentTimeline.copyWithFakeMediaItem(fakeMediaItem);
+          currentTimeline = currentTimeline.copyWithFakeMediaItem(fakeMediaItem, durationMs);
           currentMediaItemIndex = currentTimeline.getWindowCount() - 1;
           currentMediaItemIndex = currentTimeline.getWindowCount() - 1;
         } else {
         } else {
-          currentTimeline = currentTimeline.copyWithFakeMediaItem(/* fakeMediaItem= */ null);
+          currentTimeline = currentTimeline.copyWithClearedFakeMediaItem();
           // Shouldn't be C.INDEX_UNSET to make getCurrentMediaItemIndex() return masked index.
           // Shouldn't be C.INDEX_UNSET to make getCurrentMediaItemIndex() return masked index.
           // In other words, this index is either the currently playing media item index or the
           // In other words, this index is either the currently playing media item index or the
           // would-be playing index when playing.
           // would-be playing index when playing.
           currentMediaItemIndex = 0;
           currentMediaItemIndex = 0;
         }
         }
       } else if (currentMediaItemIndex != C.INDEX_UNSET) {
       } else if (currentMediaItemIndex != C.INDEX_UNSET) {
-        currentTimeline = currentTimeline.copyWithFakeMediaItem(/* fakeMediaItem= */ null);
+        currentTimeline = currentTimeline.copyWithClearedFakeMediaItem();
         if (hasMediaMetadataCompat) {
         if (hasMediaMetadataCompat) {
           MediaItem mediaItem =
           MediaItem mediaItem =
               MediaUtils.convertToMediaItem(
               MediaUtils.convertToMediaItem(
@@ -1850,7 +1849,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
                   ratingType);
                   ratingType);
           currentTimeline =
           currentTimeline =
               currentTimeline.copyWithNewMediaItem(
               currentTimeline.copyWithNewMediaItem(
-                  /* replaceIndex= */ currentMediaItemIndex, mediaItem);
+                  /* replaceIndex= */ currentMediaItemIndex, mediaItem, durationMs);
         }
         }
       } else {
       } else {
         // There's queue, but no valid queue item ID nor current media item metadata.
         // There's queue, but no valid queue item ID nor current media item metadata.
@@ -1897,7 +1896,6 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
     PlaybackException playerError =
     PlaybackException playerError =
         MediaUtils.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat);
         MediaUtils.convertToPlaybackException(newLegacyPlayerInfo.playbackStateCompat);
 
 
-    long durationMs = MediaUtils.convertToDurationMs(newLegacyPlayerInfo.mediaMetadataCompat);
     long currentPositionMs =
     long currentPositionMs =
         MediaUtils.convertToCurrentPositionMs(
         MediaUtils.convertToCurrentPositionMs(
             newLegacyPlayerInfo.playbackStateCompat,
             newLegacyPlayerInfo.playbackStateCompat,

libraries/test_session_current/src/androidTest/java/androidx/media3/session/MediaControllerWithMediaSessionCompatTest.java

@@ -246,6 +246,8 @@ public class MediaControllerWithMediaSessionCompatTest {
     AtomicLong repeatModeRef = new AtomicLong();
     AtomicLong repeatModeRef = new AtomicLong();
     AtomicReference<MediaMetadata> playlistMetadataRef = new AtomicReference<>();
     AtomicReference<MediaMetadata> playlistMetadataRef = new AtomicReference<>();
     AtomicBoolean isPlayingAdRef = new AtomicBoolean();
     AtomicBoolean isPlayingAdRef = new AtomicBoolean();
+    AtomicLong durationRef = new AtomicLong();
+    AtomicLong durationInTimelineRef = new AtomicLong();
     threadTestRule
     threadTestRule
         .getHandler()
         .getHandler()
         .postAndSync(
         .postAndSync(
@@ -260,6 +262,12 @@ public class MediaControllerWithMediaSessionCompatTest {
               shuffleModeEnabledRef.set(controller.getShuffleModeEnabled());
               shuffleModeEnabledRef.set(controller.getShuffleModeEnabled());
               playlistMetadataRef.set(controller.getPlaylistMetadata());
               playlistMetadataRef.set(controller.getPlaylistMetadata());
               isPlayingAdRef.set(controller.isPlayingAd());
               isPlayingAdRef.set(controller.isPlayingAd());
+              durationRef.set(controller.getDuration());
+              durationInTimelineRef.set(
+                  controller
+                      .getCurrentTimeline()
+                      .getWindow(/* windowIndex= */ 0, new Timeline.Window())
+                      .getDurationMs());
             });
             });
 
 
     assertThat(positionRef.get())
     assertThat(positionRef.get())
@@ -273,6 +281,8 @@ public class MediaControllerWithMediaSessionCompatTest {
     assertThat(repeatModeRef.get()).isEqualTo(Player.REPEAT_MODE_ALL);
     assertThat(repeatModeRef.get()).isEqualTo(Player.REPEAT_MODE_ALL);
     assertThat(playlistMetadataRef.get().title.toString()).isEqualTo(queueTitle.toString());
     assertThat(playlistMetadataRef.get().title.toString()).isEqualTo(queueTitle.toString());
     assertThat(isPlayingAdRef.get()).isEqualTo(isPlayingAd);
     assertThat(isPlayingAdRef.get()).isEqualTo(isPlayingAd);
+    assertThat(durationRef.get()).isEqualTo(duration);
+    assertThat(durationInTimelineRef.get()).isEqualTo(duration);
   }
   }
 
 
   @Test
   @Test