From e956bc7024d029189a762cf0d1c26711b35defee Mon Sep 17 00:00:00 2001 From: Beth Thibodeau Date: Fri, 18 Feb 2022 19:11:47 -0500 Subject: [PATCH] Load album art from URIs first To match developer recommendations, we should check URI fields for artwork first instead of bitmap fields Fixes: 220387972 Test: manual Change-Id: Icff0c9723179b0a4fa0c1814538eeb512062622a --- .../src/com/android/systemui/media/MediaDataManager.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt index 7b850504421d1..fab06c288ce1b 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt @@ -550,13 +550,13 @@ class MediaDataManager( // Album art val notif: Notification = sbn.notification - var artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) + var artworkBitmap = metadata?.let { loadBitmapFromUri(it) } + if (artworkBitmap == null) { + artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART) + } if (artworkBitmap == null) { artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART) } - if (artworkBitmap == null && metadata != null) { - artworkBitmap = loadBitmapFromUri(metadata) - } val artWorkIcon = if (artworkBitmap == null) { notif.getLargeIcon() } else {