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

This commit is contained in:
Adrian Roos
2016-05-31 20:51:49 +00:00
committed by Android (Google) Code Review

View File

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