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

Merge "Fixed a crash in the notification group manager" into mnc-dev

Browse Source
This commit is contained in:
Selim Cinek
2015-09-02 00:25:05 +00:00
committed by Android (Google) Code Review
parent 0c5fd7e379 0b4aeab281
commit 36a75d6aef
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java
View File

@@ -78,6 +78,13 @@ public class NotificationGroupManager {
Notification notif = sbn.getNotification(); Notification notif = sbn.getNotification();
String groupKey = sbn.getGroupKey(); String groupKey = sbn.getGroupKey();
final NotificationGroup group = mGroupMap.get(groupKey); 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()) { if (notif.isGroupSummary()) {
group.summary = null; group.summary = null;
} else { } else {