Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Group suppression shouldn't affect rating limiting" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-18 00:14:21 +00:00
committed by Android (Google) Code Review
parent d2b1d6d7b3 79dfdd6c67
commit 6b7b171dba
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -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

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

@@ -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")