Merge pull request #1255 from phcannesson:fix-cast-media-item-conversion

PiperOrigin-RevId: 624147863

Author: copybara-github

RELEASENOTES.md

@@ -38,6 +38,9 @@
 *   Decoder Extensions (FFmpeg, VP9, AV1, MIDI, etc.):
 *   Leanback extension:
 *   Cast Extension:
+    *   Fix bug that converted the album title of the `MediaQueueItem` to the
+        artist in the Media3 media item
+        ([#1255](https://github.com/androidx/media/pull/1255)).
 *   Test Utilities:
 *   Remove deprecated symbols:
 *   Demo app:

libraries/cast/src/main/java/androidx/media3/cast/DefaultMediaItemConverter.java

@@ -68,7 +68,7 @@ public MediaItem toMediaItem(MediaQueueItem mediaQueueItem) {
         metadataBuilder.setAlbumArtist(metadata.getString(MediaMetadata.KEY_ALBUM_ARTIST));
       }
       if (metadata.containsKey(MediaMetadata.KEY_ALBUM_TITLE)) {
-        metadataBuilder.setArtist(metadata.getString(MediaMetadata.KEY_ALBUM_TITLE));
+        metadataBuilder.setAlbumTitle(metadata.getString(MediaMetadata.KEY_ALBUM_TITLE));
       }
       if (!metadata.getImages().isEmpty()) {
         metadataBuilder.setArtworkUri(metadata.getImages().get(0).getUrl());

libraries/cast/src/test/java/androidx/media3/cast/DefaultMediaItemConverterTest.java

@@ -52,7 +52,17 @@ public void serialize_deserialize_complete() {
         builder
             .setMediaId("fooBar")
             .setUri(Uri.parse("http://example.com"))
-            .setMediaMetadata(MediaMetadata.EMPTY)
+            .setMediaMetadata(
+                new MediaMetadata.Builder()
+                    .setTitle("testTitle")
+                    .setSubtitle("testSubtitle")
+                    .setArtist("testArtist")
+                    .setAlbumArtist("testAlbumArtist")
+                    .setArtworkUri(Uri.parse("http://testArtworkUri"))
+                    .setComposer("testComposer")
+                    .setDiscNumber(42)
+                    .setTrackNumber(23)
+                    .build())
             .setMimeType(MimeTypes.APPLICATION_MPD)
             .setDrmConfiguration(
                 new MediaItem.DrmConfiguration.Builder(C.WIDEVINE_UUID)