Merge "Fix sound rate limiting issue" into oc-dr1-dev (3f0eb37e) · Commits · e / os / android_frameworks_base

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

+7 −7

Original line number	Diff line number	Diff line
		@@ -4011,13 +4011,6 @@ public class NotificationManagerService extends SystemService {
		return true;
		}

		// Suppressed for being too recently noisy
		final String pkg = record.sbn.getPackageName();
		if (mUsageStats.isAlertRateLimited(pkg)) {
		Slog.e(TAG, "Muting recently noisy " + record.getKey());
		return true;
		}

		// muted by listener
		final String disableEffects = disableNotificationEffects(record);
		if (disableEffects != null) {
		@@ -4035,6 +4028,13 @@ public class NotificationManagerService extends SystemService {
		return notification.suppressAlertingDueToGrouping();
		}

		// Suppressed for being too recently noisy
		final String pkg = record.sbn.getPackageName();
		if (mUsageStats.isAlertRateLimited(pkg)) {
		Slog.e(TAG, "Muting recently noisy " + record.getKey());
		return true;
		}

		return false;
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -831,6 +831,16 @@ public class BuzzBeepBlinkTest extends NotificationTestCase {
		verify(mUsageStats, never()).isAlertRateLimited(any());
		}

		@Test
		public void testPostingGroupSuppressedDoesNotAffectRateLimiting() throws Exception {
		NotificationRecord summary = getBeepyNotificationRecord("a", GROUP_ALERT_CHILDREN);
		summary.getNotification().flags \|= Notification.FLAG_GROUP_SUMMARY;

		mService.buzzBeepBlinkLocked(summary);

		verify(mUsageStats, never()).isAlertRateLimited(any());
		}

		@Test
		public void testCrossUserSoundMuted() throws Exception {
		final Notification n = new Builder(getContext(), "test")