Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e956bc70 authored by Beth Thibodeau's avatar Beth Thibodeau
Browse files

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
parent 3fd99e46

packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt

+4 −4
Original line number Diff line number Diff line
@@ -550,12 +550,12 @@ 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_ALBUM_ART)

            artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ART)

        }

        if (artworkBitmap == null && metadata != null) {

            artworkBitmap = loadBitmapFromUri(metadata)

        if (artworkBitmap == null) {

            artworkBitmap = metadata?.getBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART)

        }

        val artWorkIcon = if (artworkBitmap == null) {

            notif.getLargeIcon()