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

Commit 9af97c28 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

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

am: a8231efd

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

Change-Id: If1c10516ce5a1fec4d9274e288109a04f01a03af
parents bc46818d a8231efd

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -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();