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

2016-04-26 15:26:33 +00:00
parent efb951d4fe 076bddde4b
commit 6392db9df7
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();
                    }
                }