Merge "Load album art from URIs first" into tm-dev (233bc668) · Commits · e / os / android_frameworks_base

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