Merge "cancel group children before summaries" into nyc-dev

am: 6392db9 * commit '6392db9df7ca1a809ff882e0792bf7fbc105ce96': cancel group children before summaries Change-Id: If19f0a460346287c66f21db5f890934fef7a2eca
2016-04-26 15:31:10 +00:00
parent 1cb2dd9a8f 6392db9df7
commit ed012b5b88
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();
                    }
                }