Merge "Fix crash with intent-less actions" into nyc-dev am: ac2b44f502

am: a8231efd8f

* commit 'a8231efd8f5c7e01e69edab4a2918fb085e2df50':
  Fix crash with intent-less actions

Change-Id: If1c10516ce5a1fec4d9274e288109a04f01a03af

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