Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79dfdd6c authored Apr 17, 2018 by Julia Reynolds

Group suppression shouldn't affect rating limiting

For real this time

Test: runtest systemui-notification
Change-Id: Ia4d771399ca17e9f8dcb386f6f3daff64dc66a69
Fixes: 69300511

parent da80202b

services/core/java/com/android/server/notification/NotificationManagerService.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

services/tests/uiservicestests/src/com/android/server/notification/BuzzBeepBlinkTest.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -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")