am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev

* commit '2af5010a6793d27eda86432f1ec3ebbe92e1d99e':
  Fixed a crash in the notification group manager
This commit is contained in:
Selim Cinek
2015-09-02 01:08:38 +00:00
committed by Android Git Automerger

View File

@@ -78,6 +78,13 @@ public class NotificationGroupManager {
Notification notif = sbn.getNotification();
String groupKey = sbn.getGroupKey();
final NotificationGroup group = mGroupMap.get(groupKey);
if (group == null) {
// When an app posts 2 different notifications as summary of the same group, then a
// cancellation of the first notification removes this group.
// This situation is not supported and we will not allow such notifications anymore in
// the close future. See b/23676310 for reference.
return;
}
if (notif.isGroupSummary()) {
group.summary = null;
} else {