From 79dfdd6c671da78ef964bdf5baa98282f63a7680 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Tue, 17 Apr 2018 15:36:33 -0400 Subject: [PATCH] Group suppression shouldn't affect rating limiting For real this time Test: runtest systemui-notification Change-Id: Ia4d771399ca17e9f8dcb386f6f3daff64dc66a69 Fixes: 69300511 --- .../server/notification/NotificationManagerService.java | 4 +++- .../android/server/notification/BuzzBeepBlinkTest.java | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index d112c0212fa6e..8a64308692881 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -4763,7 +4763,9 @@ public class NotificationManagerService extends SystemService { // Suppressed because another notification in its group handles alerting if (record.sbn.isGroup()) { - return notification.suppressAlertingDueToGrouping(); + if (notification.suppressAlertingDueToGrouping()) { + return true; + } } // Suppressed for being too recently noisy diff --git a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java index cb64c9c5edd7c..78099996a1a01 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -941,6 +941,15 @@ public class BuzzBeepBlinkTest extends UiServiceTestCase { verify(mUsageStats, never()).isAlertRateLimited(any()); } + @Test + public void testGroupSuppressionFailureDoesNotAffectRateLimiting() { + NotificationRecord summary = getBeepyNotificationRecord("a", GROUP_ALERT_SUMMARY); + summary.getNotification().flags |= Notification.FLAG_GROUP_SUMMARY; + + mService.buzzBeepBlinkLocked(summary); + verify(mUsageStats, times(1)).isAlertRateLimited(any()); + } + @Test public void testCrossUserSoundMuted() throws Exception { final Notification n = new Builder(getContext(), "test")