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

Commit ad390703 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Load album art from URIs first" into tm-dev am: 233bc668 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17014237

Change-Id: I16faf904fbf3aa453dca33b29315b7b29e18b3c3
parents 5ecbfe2a 233bc668

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()