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

Merge "Fix sound rate limiting issue" into oc-dr1-dev

Browse Source 
am: 61913f178e

Change-Id: I0d3f100a55f3c8a9e2c0d2961e90065d453708ae
This commit is contained in:
Julia Reynolds
2017-07-20 18:25:55 +00:00
committed by android-build-merger
parent 747938ed61 61913f178e
commit 3f0eb37e66
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4011,13 +4011,6 @@ public class NotificationManagerService extends SystemService {
return true; 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 // muted by listener
final String disableEffects = disableNotificationEffects(record); final String disableEffects = disableNotificationEffects(record);
if (disableEffects != null) { if (disableEffects != null) {
@@ -4035,6 +4028,13 @@ public class NotificationManagerService extends SystemService {
return notification.suppressAlertingDueToGrouping(); 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; return false;
} }

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

@@ -831,6 +831,16 @@ public class BuzzBeepBlinkTest extends NotificationTestCase {
verify(mUsageStats, never()).isAlertRateLimited(any()); 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 @Test
public void testCrossUserSoundMuted() throws Exception { public void testCrossUserSoundMuted() throws Exception {
final Notification n = new Builder(getContext(), "test") final Notification n = new Builder(getContext(), "test")