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 am: ac2b44f502 am: a8231efd8f

Browse Source 
am: 9af97c2879

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

Change-Id: I3c4d852918e598fa9a44499ae0b879e967ac04f3
This commit is contained in:
Adrian Roos
2016-05-31 21:10:43 +00:00
committed by android-build-merger
parent 4c1e147085 9af97c2879
commit c52fa732c1
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) {
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();