Use TextUtils to compare CharSequence instances

PiperOrigin-RevId: 861109807
(cherry picked from commit 99032c7)

Author: marcbaechinger

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

@@ -25,6 +25,7 @@
 
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import androidx.annotation.IntDef;
 import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
@@ -1236,13 +1237,13 @@ public boolean equals(@Nullable Object obj) {
       return false;
     }
     MediaMetadata that = (MediaMetadata) obj;
-    return Objects.equals(title, that.title)
-        && Objects.equals(artist, that.artist)
-        && Objects.equals(albumTitle, that.albumTitle)
-        && Objects.equals(albumArtist, that.albumArtist)
-        && Objects.equals(displayTitle, that.displayTitle)
-        && Objects.equals(subtitle, that.subtitle)
-        && Objects.equals(description, that.description)
+    return TextUtils.equals(title, that.title)
+        && TextUtils.equals(artist, that.artist)
+        && TextUtils.equals(albumTitle, that.albumTitle)
+        && TextUtils.equals(albumArtist, that.albumArtist)
+        && TextUtils.equals(displayTitle, that.displayTitle)
+        && TextUtils.equals(subtitle, that.subtitle)
+        && TextUtils.equals(description, that.description)
         && Objects.equals(durationMs, that.durationMs)
         && Objects.equals(userRating, that.userRating)
         && Objects.equals(overallRating, that.overallRating)
@@ -1260,14 +1261,14 @@ public boolean equals(@Nullable Object obj) {
         && Objects.equals(releaseYear, that.releaseYear)
         && Objects.equals(releaseMonth, that.releaseMonth)
         && Objects.equals(releaseDay, that.releaseDay)
-        && Objects.equals(writer, that.writer)
-        && Objects.equals(composer, that.composer)
-        && Objects.equals(conductor, that.conductor)
+        && TextUtils.equals(writer, that.writer)
+        && TextUtils.equals(composer, that.composer)
+        && TextUtils.equals(conductor, that.conductor)
         && Objects.equals(discNumber, that.discNumber)
         && Objects.equals(totalDiscCount, that.totalDiscCount)
-        && Objects.equals(genre, that.genre)
-        && Objects.equals(compilation, that.compilation)
-        && Objects.equals(station, that.station)
+        && TextUtils.equals(genre, that.genre)
+        && TextUtils.equals(compilation, that.compilation)
+        && TextUtils.equals(station, that.station)
         && Objects.equals(mediaType, that.mediaType)
         && Objects.equals(supportedCommands, that.supportedCommands)
         && ((extras == null) == (that.extras == null));

libraries/session/src/test/java/androidx/media3/session/LegacyConversionsTest.java

@@ -36,6 +36,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.service.media.MediaBrowserService;
+import android.text.SpannableString;
 import android.text.SpannedString;
 import androidx.annotation.Nullable;
 import androidx.media3.common.C;
@@ -133,7 +134,9 @@ public void convertBrowserItemListToMediaItemList() {
 
   @Test
   public void convertToQueueItem_withArtworkData() throws Exception {
-    MediaItem mediaItem = createMediaItemWithArtworkData("testId", /* durationMs= */ 10_000L);
+    MediaItem mediaItem =
+        createMediaItemWithArtworkData(
+            "testId", /* durationMs= */ 10_000L, /* useSpannableString= */ false);
     MediaMetadata mediaMetadata = mediaItem.mediaMetadata;
     ListenableFuture<Bitmap> bitmapFuture = bitmapLoader.decodeBitmap(mediaMetadata.artworkData);
     @Nullable Bitmap bitmap = bitmapFuture.get(10, SECONDS);
@@ -409,7 +412,12 @@ public void convertToMediaMetadata_withCustomKey() {
   @Test
   public void convertToMediaMetadata_roundTripViaMediaMetadataCompat_returnsEqualMediaItemMetadata()
       throws Exception {
-    MediaItem testMediaItem = createMediaItemWithArtworkData("testZZZ", /* durationMs= */ 10_000L);
+    MediaItem testMediaItem =
+        createMediaItemWithArtworkData(
+            "testZZZ", /* durationMs= */ 10_000L, /* useSpannableString= */ false);
+    MediaItem testMediaItemWithSpannableStrings =
+        createMediaItemWithArtworkData(
+            "testZZZ", /* durationMs= */ 10_000L, /* useSpannableString= */ true);
     MediaMetadata testMediaMetadata = testMediaItem.mediaMetadata;
     @Nullable Bitmap testArtworkBitmap = null;
     @Nullable
@@ -428,7 +436,7 @@ public void convertToMediaMetadata_roundTripViaMediaMetadataCompat_returnsEqualM
     MediaMetadata mediaMetadata =
         LegacyConversions.convertToMediaMetadata(testMediaMetadataCompat, RatingCompat.RATING_NONE);
 
-    assertThat(mediaMetadata).isEqualTo(testMediaMetadata);
+    assertThat(mediaMetadata).isEqualTo(testMediaItemWithSpannableStrings.mediaMetadata);
     assertThat(mediaMetadata.artworkData).isNotNull();
   }
 
@@ -489,7 +497,11 @@ public void convertToMediaMetadata_displayTitleNotSet_usesPreferredDescriptionOr
       convertToMediaMetadata_roundTripViaMediaDescriptionCompat_returnsEqualMediaItemMetadata()
           throws Exception {
     MediaItem testMediaItem =
-        createMediaItemWithArtworkData("testZZZ", /* durationMs= */ C.TIME_UNSET);
+        createMediaItemWithArtworkData(
+            "testZZZ", /* durationMs= */ C.TIME_UNSET, /* useSpannableString= */ false);
+    MediaItem testMediaItemWithSpannableStrings =
+        createMediaItemWithArtworkData(
+            "testZZZ", /* durationMs= */ C.TIME_UNSET, /* useSpannableString= */ true);
     MediaMetadata testMediaMetadata = testMediaItem.mediaMetadata;
     @Nullable Bitmap testArtworkBitmap = null;
     @Nullable
@@ -503,7 +515,7 @@ public void convertToMediaMetadata_displayTitleNotSet_usesPreferredDescriptionOr
     MediaMetadata mediaMetadata =
         LegacyConversions.convertToMediaMetadata(mediaDescriptionCompat, RatingCompat.RATING_NONE);
 
-    assertThat(mediaMetadata).isEqualTo(testMediaMetadata);
+    assertThat(mediaMetadata).isEqualTo(testMediaItemWithSpannableStrings.mediaMetadata);
     assertThat(mediaMetadata.artworkData).isNotNull();
   }
 
@@ -1557,16 +1569,21 @@ private static PlaybackStateCompat createErrorPlaybackStateCompatWithoutMessage(
         .build();
   }
 
-  private static MediaItem createMediaItemWithArtworkData(String mediaId, long durationMs) {
+  private static MediaItem createMediaItemWithArtworkData(
+      String mediaId, long durationMs, boolean useSpannableString) {
     Bundle extras = new Bundle();
     extras.putLong(
         MediaConstants.EXTRAS_KEY_IS_EXPLICIT, MediaConstants.EXTRAS_VALUE_ATTRIBUTE_PRESENT);
+    CharSequence title = useSpannableString ? new SpannableString("title") : "title";
+    CharSequence displayTitle =
+        useSpannableString ? new SpannableString("displayTitle") : "displayTitle";
+    CharSequence author = useSpannableString ? new SpannableString("author") : "author";
     MediaMetadata.Builder mediaMetadataBuilder =
         new MediaMetadata.Builder()
             .setMediaType(MediaMetadata.MEDIA_TYPE_PLAYLIST)
-            .setTitle("title")
-            .setDisplayTitle("displayTitle")
-            .setAuthor("author")
+            .setTitle(title)
+            .setDisplayTitle(displayTitle)
+            .setAuthor(author)
             .setIsBrowsable(false)
             .setIsPlayable(true)
             .setExtras(extras);