From 4580c835590880004596419fbb3d9a43f103b899 Mon Sep 17 00:00:00 2001
From: Beth Thibodeau <ethibodeau@google.com>
Date: Fri, 15 May 2020 20:11:44 -0400
Subject: [PATCH] Add check for null actions

Fixes: 156779454
Test: manual
Change-Id: I4b41f0ff78373ae59e29b1fc5bede52f75848ede
---
 .../android/systemui/media/MediaDataManager.kt   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
index 07ce9e4a62269..90c558a1ee971 100644
--- a/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
+++ b/packages/SystemUI/src/com/android/systemui/media/MediaDataManager.kt
@@ -54,7 +54,7 @@ private const val DEFAULT_LUMINOSITY = 0.25f
 private const val LUMINOSITY_THRESHOLD = 0.05f
 private const val SATURATION_MULTIPLIER = 0.8f
 
-private val LOADING = MediaData(false,  0, null, null, null, null, null,
+private val LOADING = MediaData(false, 0, null, null, null, null, null,
         emptyList(), emptyList(), null, null, null)
 
 /**
@@ -191,12 +191,14 @@ class MediaDataManager @Inject constructor(
         // TODO: b/153736623 look into creating actions when this isn't a media style notification
 
         val packageContext: Context = sbn.getPackageContext(context)
-        for (action in actions) {
-            val mediaAction = MediaAction(
-                    action.getIcon().loadDrawable(packageContext),
-                    action.actionIntent,
-                    action.title)
-            actionIcons.add(mediaAction)
+        if (actions != null) {
+            for (action in actions) {
+                val mediaAction = MediaAction(
+                        action.getIcon().loadDrawable(packageContext),
+                        action.actionIntent,
+                        action.title)
+                actionIcons.add(mediaAction)
+            }
         }
 
         foregroundExcecutor.execute {