Merge "cancel group children before summaries" into nyc-dev am: 6392db9

am: ed012b5 * commit 'ed012b5b885f1ced8bfad00a9cdbeafb52fd96e1': cancel group children before summaries Change-Id: I9be89f47fdaf1efcc696b14ccba3a983341b7e42
2016-04-26 15:34:31 +00:00
parent fd7c754c5e ed012b5b88
commit 77631d8dc8
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -3316,9 +3316,9 @@ public class NotificationManagerService extends SystemService {

                        mNotificationList.remove(index);

-                        cancelNotificationLocked(r, sendDelete, reason);
                        cancelGroupChildrenLocked(r, callingUid, callingPid, listenerName,
                                REASON_GROUP_SUMMARY_CANCELED);
+                        cancelNotificationLocked(r, sendDelete, reason);
                        updateLightsLocked();
                    }
                }