Change the behaviour in MediaMetadata.Builder.populate

Populate both `artworkUri` and `artworkData` in `MediaMetadata.Builder.populate(MediaMetadata)` when at least one of them is non-null. Issue: androidx/media#964 PiperOrigin-RevId: 600826103
google · Jan 23, 2024 · 8aa81bd · 8aa81bd
1 parent 61be263
commit 8aa81bd
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/library/common/src/main/java/com/google/android/exoplayer2/MediaMetadata.java b/library/common/src/main/java/com/google/android/exoplayer2/MediaMetadata.java
@@ -464,7 +464,12 @@ public Builder populateFromMetadata(List<Metadata> metadataList) {
       return this;
     }
 
-    /** Populates all the fields from {@code mediaMetadata}, provided they are non-null. */
+    /**
+     * Populates all the fields from {@code mediaMetadata}.
+     *
+     * <p>Fields are populated when they are non-null with an exception that both {@code artworkUri}
+     * and {@code artworkData} are populated, when at least one of them is non-null.
+     */
     @SuppressWarnings("deprecation") // Populating deprecated fields.
     @CanIgnoreReturnValue
     public Builder populate(@Nullable MediaMetadata mediaMetadata) {
@@ -498,11 +503,9 @@ public Builder populate(@Nullable MediaMetadata mediaMetadata) {
       if (mediaMetadata.overallRating != null) {
         setOverallRating(mediaMetadata.overallRating);
       }
-      if (mediaMetadata.artworkData != null) {
-        setArtworkData(mediaMetadata.artworkData, mediaMetadata.artworkDataType);
-      }
-      if (mediaMetadata.artworkUri != null) {
+      if (mediaMetadata.artworkUri != null || mediaMetadata.artworkData != null) {
         setArtworkUri(mediaMetadata.artworkUri);
+        setArtworkData(mediaMetadata.artworkData, mediaMetadata.artworkDataType);
       }
       if (mediaMetadata.trackNumber != null) {
         setTrackNumber(mediaMetadata.trackNumber);

diff --git a/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java b/library/common/src/test/java/com/google/android/exoplayer2/MediaMetadataTest.java
@@ -89,7 +89,7 @@ public void builderSetArtworkData_setsArtworkData() {
   }
 
   @Test
-  public void builderSetArworkUri_setsArtworkUri() {
+  public void builderSetArtworkUri_setsArtworkUri() {
     Uri uri = Uri.parse("https://www.google.com");
     MediaMetadata mediaMetadata = new MediaMetadata.Builder().setArtworkUri(uri).build();
 
@@ -107,6 +107,35 @@ public void populate_populatesEveryField() {
     assertThat(populated.extras.getString(EXTRAS_KEY)).isEqualTo(EXTRAS_VALUE);
   }
 
+  @Test
+  public void populate_withArtworkUriOnly_updatesBothArtWorkUriAndArtworkData() {
+    Uri artWorkUri = Uri.parse("https://www.test.com");
+    MediaMetadata mediaMetadata = new MediaMetadata.Builder().setArtworkUri(artWorkUri).build();
+    MediaMetadata originalMediaMetadata = getFullyPopulatedMediaMetadata();
+
+    MediaMetadata populatedMediaMetadata =
+        originalMediaMetadata.buildUpon().populate(mediaMetadata).build();
+
+    assertThat(populatedMediaMetadata.artworkUri).isEqualTo(artWorkUri);
+    assertThat(populatedMediaMetadata.artworkData).isNull();
+  }
+
+  @Test
+  public void populate_withArtworkDataOnly_updatesBothArtWorkUriAndArtworkData() {
+    byte[] artworkData = new byte[] {35, 12, 6, 77};
+    MediaMetadata mediaMetadata =
+        new MediaMetadata.Builder()
+            .setArtworkData(artworkData, MediaMetadata.PICTURE_TYPE_MEDIA)
+            .build();
+    MediaMetadata originalMediaMetadata = getFullyPopulatedMediaMetadata();
+
+    MediaMetadata populatedMediaMetadata =
+        originalMediaMetadata.buildUpon().populate(mediaMetadata).build();
+
+    assertThat(populatedMediaMetadata.artworkData).isEqualTo(artworkData);
+    assertThat(populatedMediaMetadata.artworkUri).isNull();
+  }
+
   @Test
   public void toBundleSkipsDefaultValues_fromBundleRestoresThem() {
     MediaMetadata mediaMetadata = new MediaMetadata.Builder().build();