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

Merge "NoMan: Cancel children when update removes summary" into lmp-dev

Browse Source
This commit is contained in:
Christoph Studer
2014-08-26 21:17:17 +00:00
committed by Android (Google) Code Review
parent faa9957fd3 c44caa9b84
commit f50d82a1e4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1654,6 +1654,16 @@ public class NotificationManagerService extends SystemService {
}
synchronized (mNotificationList) {
// Clear out group children of the old notification if the update causes the
// group summary to go away. This happens when the old notification was a
// summary and the new one isn't, or when the old notification was a summary
// and its group key changed.
if (old != null && old.getNotification().isGroupSummary() &&
(!notification.isGroupSummary() ||
!old.getGroupKey().equals(r.getGroupKey()))) {
cancelGroupChildrenLocked(old, callingUid, callingPid, null);
}
int index = indexOfNotificationLocked(n.getKey());
if (index < 0) {
mNotificationList.add(r);
@@ -2404,10 +2414,9 @@ public class NotificationManagerService extends SystemService {
final int N = mNotificationList.size();
for (int i = N - 1; i >= 0; i--) {
NotificationRecord childR = mNotificationList.get(i);
Notification childN = childR.getNotification();
StatusBarNotification childSbn = childR.sbn;
if (childR.getUserId() == userId && pkg.equals(childSbn.getPackageName()) &&
n.getGroup().equals(childN.getGroup())) {
if (childR.getNotification().isGroupChild() &&
childR.getGroupKey().equals(r.getGroupKey())) {
EventLogTags.writeNotificationCancel(callingUid, callingPid,
pkg, childSbn.getId(), childSbn.getTag(), userId, 0, 0,
REASON_GROUP_SUMMARY_CANCELED, listenerName);