Merge "Autobundle all notifications; don't leave the most recent one free." into nyc-dev

1 files changed, 1 insertions, 6 deletions

diff --git a/packages/ExtServices/src/android/ext/services/notification/Ranker.java b/packages/ExtServices/src/android/ext/services/notification/Ranker.java
index f3ce35566cc0..d43f07627375 100644
--- a/packages/ExtServices/src/android/ext/services/notification/Ranker.java
+++ b/packages/ExtServices/src/android/ext/services/notification/Ranker.java
@@ -73,13 +73,8 @@ public final class Ranker extends NotificationRankerService {
                     mUnbundledNotifications.put(sbn.getPackageName(), notificationsForPackage);
 
                     if (notificationsForPackage.size() >= AUTOBUNDLE_AT_COUNT) {
-                        // Autobundle all but the most recently posted (not updated) notification.
-                        int count = 0;
                         for (String key : notificationsForPackage) {
-                            if (count < notificationsForPackage.size() - 1) {
-                                notificationsToBundle.add(key);
-                            }
-                            count++;
+                            notificationsToBundle.add(key);
                         }
                     }
                 }