From 2608cc891ddb989d2ba604fe556eeb5080bbf51b Mon Sep 17 00:00:00 2001
From: Adrian Roos <roosa@google.com>
Date: Fri, 27 May 2016 15:35:45 -0700
Subject: [PATCH] Fix crash with intent-less actions

Follow-up to I00d46036a2cbb73f7f733fd35bf0b743a02807a1

Bug: 28818704
Change-Id: I9a444b9dd4cea92b4a770d7051c05c48818892ad
---
 .../server/notification/NotificationManagerService.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index b5a8bf3f4d1a5..a8b1a4a2cd052 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2582,6 +2582,9 @@ public class NotificationManagerService extends SystemService {
         }
         if (notification.actions != null) {
             for (Notification.Action action: notification.actions) {
+                if (action.actionIntent == null) {
+                    continue;
+                }
                 am.setPendingIntentWhitelistDuration(action.actionIntent.getTarget(), duration);
                 setPendingIntentWhitelistDuration(am, duration, action.getExtras());
                 final RemoteInput[] remoteInputs = action.getRemoteInputs();