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

Commit c52fa732 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 

am: 9af97c28

* commit '9af97c28':
  Fix crash with intent-less actions

Change-Id: I3c4d852918e598fa9a44499ae0b879e967ac04f3
parents 4c1e1470 9af97c28

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