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

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

Merge "Add check for null actions" into rvc-dev am: 4cb4f934 

Change-Id: Ibc77edbc21b02981bc785edd454abe99278bd5b3
parents e046407a 4cb4f934

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

+9 −7
Original line number Original line Diff line number Diff line
@@ -191,6 +191,7 @@ class MediaDataManager @Inject constructor( 
        // TODO: b/153736623 look into creating actions when this isn't a media style notification

        // TODO: b/153736623 look into creating actions when this isn't a media style notification





        val packageContext: Context = sbn.getPackageContext(context)

        val packageContext: Context = sbn.getPackageContext(context)

        if (actions != null) {

            for (action in actions) {

            for (action in actions) {

                val mediaAction = MediaAction(

                val mediaAction = MediaAction(

                        action.getIcon().loadDrawable(packageContext),

                        action.getIcon().loadDrawable(packageContext),
@@ -198,6 +199,7 @@ class MediaDataManager @Inject constructor( 
                        action.title)

                        action.title)

                actionIcons.add(mediaAction)

                actionIcons.add(mediaAction)

            }

            }

        }





        foregroundExcecutor.execute {

        foregroundExcecutor.execute {

            onMediaDataLoaded(key, MediaData(true, bgColor, app, smallIconDrawable, artist, song,

            onMediaDataLoaded(key, MediaData(true, bgColor, app, smallIconDrawable, artist, song,