Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ac2b44f502

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

Change-Id: Ia0835af917c5818ec90fc96691d512c98e89d7e0
This commit is contained in:
Adrian Roos
2016-05-31 20:59:16 +00:00
committed by android-build-merger
parent 8ff8259ca4 ac2b44f502
commit a8231efd8f
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -2582,6 +2582,9 @@ public class NotificationManagerService extends SystemService {
} }
if (notification.actions != null) { if (notification.actions != null) {
for (Notification.Action action: notification.actions) { for (Notification.Action action: notification.actions) {
if (action.actionIntent == null) {
continue;
}
am.setPendingIntentWhitelistDuration(action.actionIntent.getTarget(), duration); am.setPendingIntentWhitelistDuration(action.actionIntent.getTarget(), duration);
setPendingIntentWhitelistDuration(am, duration, action.getExtras()); setPendingIntentWhitelistDuration(am, duration, action.getExtras());
final RemoteInput[] remoteInputs = action.getRemoteInputs(); final RemoteInput[] remoteInputs = action.getRemoteInputs();