From 08e6f30b6841fc9876f34f9af452a24eb4accef6 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 18 Oct 2024 02:23:51 -0700
Subject: [PATCH] Look for METADATA_KEY_ART_URI for legacy media items

PiperOrigin-RevId: 687222830
---
 .../java/androidx/media3/session/LegacyConversions.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java b/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java
index 7602c190e1..4f3e8ed990 100644
--- a/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java
+++ b/libraries/session/src/main/java/androidx/media3/session/LegacyConversions.java
@@ -621,7 +621,8 @@ import java.util.concurrent.TimeoutException;
         getFirstString(
             metadataCompat,
             MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI,
-            MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI);
+            MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI,
+            MediaMetadataCompat.METADATA_KEY_ART_URI);
     if (artworkUriString != null) {
       builder.setArtworkUri(Uri.parse(artworkUriString));
     }
@@ -631,7 +632,8 @@ import java.util.concurrent.TimeoutException;
         getFirstBitmap(
             metadataCompat,
             MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON,
-            MediaMetadataCompat.METADATA_KEY_ALBUM_ART);
+            MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
+            MediaMetadataCompat.METADATA_KEY_ART);
     if (artworkBitmap != null) {
       try {
         byte[] artworkData = convertToByteArray(artworkBitmap);
@@ -752,6 +754,7 @@ import java.util.concurrent.TimeoutException;
           MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON_URI, metadata.artworkUri.toString());
       builder.putString(
           MediaMetadataCompat.METADATA_KEY_ALBUM_ART_URI, metadata.artworkUri.toString());
+      builder.putString(MediaMetadataCompat.METADATA_KEY_ART_URI, metadata.artworkUri.toString());
     }
 
     if (artworkBitmap != null) {