diff options
8 files changed, 235 insertions, 21 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index c7ae91a7796c..bc0534a353b3 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -10681,7 +10681,7 @@ public final class Settings { /** * The maximum allowed notification enqueue rate in Hertz. * - * Should be a float, and includes both posts and updates. + * Should be a float, and includes updates only. * @hide */ public static final String MAX_NOTIFICATION_ENQUEUE_RATE = "max_notification_enqueue_rate"; diff --git a/services/core/java/com/android/server/notification/AlertRateLimiter.java b/services/core/java/com/android/server/notification/AlertRateLimiter.java new file mode 100644 index 000000000000..e4a79345a040 --- /dev/null +++ b/services/core/java/com/android/server/notification/AlertRateLimiter.java @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package com.android.server.notification; + + +/** + * {@hide} + */ +public class AlertRateLimiter { + static final long ALLOWED_ALERT_INTERVAL = 1000; + private long mLastNotificationMillis = 0; + + boolean isRateLimited(long now) { + final long millisSinceLast = now - mLastNotificationMillis; + if (millisSinceLast < 0 || millisSinceLast < ALLOWED_ALERT_INTERVAL) { + return true; + } + mLastNotificationMillis = now; + return false; + } +} diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index e7bfa2d57a2b..77ee6c174687 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -1120,6 +1120,11 @@ public class NotificationManagerService extends SystemService { mIsTelevision = isTelevision; } + @VisibleForTesting + void setUsageStats(NotificationUsageStats us) { + mUsageStats = us; + } + // TODO: Tests should call onStart instead once the methods above are removed. @VisibleForTesting void init(Looper looper, IPackageManager packageManager, PackageManager packageManagerClient, @@ -3838,18 +3843,6 @@ public class NotificationManagerService extends SystemService { // Should this notification make noise, vibe, or use the LED? final boolean aboveThreshold = record.getImportance() >= NotificationManager.IMPORTANCE_DEFAULT; - final boolean canInterrupt = aboveThreshold && !record.isIntercepted(); - if (DBG) - Slog.v(TAG, - "pkg=" + record.sbn.getPackageName() + " canInterrupt=" + canInterrupt + - " intercept=" + record.isIntercepted() - ); - - // If we're not supposed to beep, vibrate, etc. then don't. - final String disableEffects = disableNotificationEffects(record); - if (disableEffects != null) { - ZenLog.traceDisableEffects(record, disableEffects); - } // Remember if this notification already owns the notification channels. boolean wasBeep = key != null && key.equals(mSoundNotificationKey); @@ -3858,20 +3851,16 @@ public class NotificationManagerService extends SystemService { boolean hasValidVibrate = false; boolean hasValidSound = false; - if (isNotificationForCurrentUser(record)) { + if (aboveThreshold && isNotificationForCurrentUser(record)) { // If the notification will appear in the status bar, it should send an accessibility // event if (!record.isUpdate && record.getImportance() > IMPORTANCE_MIN) { sendAccessibilityEvent(notification, record.sbn.getPackageName()); } - - if (disableEffects == null - && canInterrupt - && mSystemReady - && mAudioManager != null) { - if (DBG) Slog.v(TAG, "Interrupting!"); + if (mSystemReady && mAudioManager != null) { Uri soundUri = record.getSound(); hasValidSound = soundUri != null && !Uri.EMPTY.equals(soundUri); + long[] vibration = record.getVibration(); // Demote sound to vibration if vibration missing & phone in vibration mode. if (vibration == null @@ -3882,7 +3871,10 @@ public class NotificationManagerService extends SystemService { } hasValidVibrate = vibration != null; - if (!shouldMuteNotificationLocked(record)) { + boolean hasAudibleAlert = hasValidSound || hasValidVibrate; + + if (hasAudibleAlert && !shouldMuteNotificationLocked(record)) { + if (DBG) Slog.v(TAG, "Interrupting!"); if (hasValidSound) { mSoundNotificationKey = key; if (mInCall) { @@ -3939,14 +3931,37 @@ public class NotificationManagerService extends SystemService { @GuardedBy("mNotificationLock") boolean shouldMuteNotificationLocked(final NotificationRecord record) { + // Suppressed because it's a silent update final Notification notification = record.getNotification(); if(record.isUpdate && (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0) { 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) { + ZenLog.traceDisableEffects(record, disableEffects); + return true; + } + + // suppressed due to DND + if (record.isIntercepted()) { + return true; + } + + // Suppressed because another notification in its group handles alerting if (record.sbn.isGroup()) { return notification.suppressAlertingDueToGrouping(); } + return false; } diff --git a/services/core/java/com/android/server/notification/NotificationUsageStats.java b/services/core/java/com/android/server/notification/NotificationUsageStats.java index e8cf6a195c90..3689cb10dfda 100644 --- a/services/core/java/com/android/server/notification/NotificationUsageStats.java +++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java @@ -114,6 +114,18 @@ public class NotificationUsageStats { } /** + * Called when a notification wants to alert. + */ + public synchronized boolean isAlertRateLimited(String packageName) { + AggregatedStats stats = getOrCreateAggregatedStatsLocked(packageName); + if (stats != null) { + return stats.isAlertRateLimited(); + } else { + return false; + } + } + + /** * Called when a notification is tentatively enqueued by an app, before rate checking. */ public synchronized void registerEnqueuedByApp(String packageName) { @@ -386,7 +398,9 @@ public class NotificationUsageStats { public ImportanceHistogram quietImportance; public ImportanceHistogram finalImportance; public RateEstimator enqueueRate; + public AlertRateLimiter alertRate; public int numRateViolations; + public int numAlertViolations; public int numQuotaViolations; public long mLastAccessTime; @@ -398,6 +412,7 @@ public class NotificationUsageStats { quietImportance = new ImportanceHistogram(context, "note_imp_quiet_"); finalImportance = new ImportanceHistogram(context, "note_importance_"); enqueueRate = new RateEstimator(); + alertRate = new AlertRateLimiter(); } public AggregatedStats getPrevious() { @@ -510,6 +525,7 @@ public class NotificationUsageStats { maybeCount("note_sub_text", (numWithSubText - previous.numWithSubText)); maybeCount("note_info_text", (numWithInfoText - previous.numWithInfoText)); maybeCount("note_over_rate", (numRateViolations - previous.numRateViolations)); + maybeCount("note_over_alert_rate", (numAlertViolations - previous.numAlertViolations)); maybeCount("note_over_quota", (numQuotaViolations - previous.numQuotaViolations)); noisyImportance.maybeCount(previous.noisyImportance); quietImportance.maybeCount(previous.quietImportance); @@ -542,6 +558,7 @@ public class NotificationUsageStats { previous.numWithSubText = numWithSubText; previous.numWithInfoText = numWithInfoText; previous.numRateViolations = numRateViolations; + previous.numAlertViolations = numAlertViolations; previous.numQuotaViolations = numQuotaViolations; noisyImportance.update(previous.noisyImportance); quietImportance.update(previous.quietImportance); @@ -576,6 +593,14 @@ public class NotificationUsageStats { enqueueRate.update(now); } + public boolean isAlertRateLimited() { + boolean limited = alertRate.isRateLimited(SystemClock.elapsedRealtime()); + if (limited) { + numAlertViolations++; + } + return limited; + } + private String toStringWithIndent(String indent) { StringBuilder output = new StringBuilder(); output.append(indent).append("AggregatedStats{\n"); @@ -634,7 +659,11 @@ public class NotificationUsageStats { output.append("numWithSubText=").append(numWithSubText).append("\n"); output.append(indentPlusTwo); output.append("numWithInfoText=").append(numWithInfoText).append("\n"); + output.append(indentPlusTwo); output.append("numRateViolations=").append(numRateViolations).append("\n"); + output.append(indentPlusTwo); + output.append("numAlertViolations=").append(numAlertViolations).append("\n"); + output.append(indentPlusTwo); output.append("numQuotaViolations=").append(numQuotaViolations).append("\n"); output.append(indentPlusTwo).append(noisyImportance.toString()).append("\n"); output.append(indentPlusTwo).append(quietImportance.toString()).append("\n"); @@ -677,6 +706,7 @@ public class NotificationUsageStats { maybePut(dump, "numRateViolations", numRateViolations); maybePut(dump, "numQuotaLViolations", numQuotaViolations); maybePut(dump, "notificationEnqueueRate", getEnqueueRate()); + maybePut(dump, "numAlertViolations", numAlertViolations); noisyImportance.maybePut(dump, previous.noisyImportance); quietImportance.maybePut(dump, previous.quietImportance); finalImportance.maybePut(dump, previous.finalImportance); diff --git a/services/tests/notification/src/com/android/server/notification/AlertRateLimiterTest.java b/services/tests/notification/src/com/android/server/notification/AlertRateLimiterTest.java new file mode 100644 index 000000000000..5ed8210a80bc --- /dev/null +++ b/services/tests/notification/src/com/android/server/notification/AlertRateLimiterTest.java @@ -0,0 +1,72 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.notification; + +import static com.android.server.notification.AlertRateLimiter.ALLOWED_ALERT_INTERVAL; + +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertTrue; + +import android.support.test.runner.AndroidJUnit4; +import android.test.suitebuilder.annotation.SmallTest; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +@SmallTest +@RunWith(AndroidJUnit4.class) +public class AlertRateLimiterTest extends NotificationTestCase { + + private long mTestStartTime; + private + AlertRateLimiter mLimiter; + + @Before + public void setUp() { + mTestStartTime = 1225731600000L; + mLimiter = new AlertRateLimiter(); + } + + @Test + public void testFirstAlertAllowed() throws Exception { + assertFalse(mLimiter.isRateLimited(mTestStartTime)); + } + + @Test + public void testAllowedAfterSecond() throws Exception { + assertFalse(mLimiter.isRateLimited(mTestStartTime)); + assertFalse(mLimiter.isRateLimited(mTestStartTime + ALLOWED_ALERT_INTERVAL)); + } + + @Test + public void testAllowedAfterSecondEvenWithBlockedEntries() throws Exception { + assertFalse(mLimiter.isRateLimited(mTestStartTime)); + assertTrue(mLimiter.isRateLimited(mTestStartTime + ALLOWED_ALERT_INTERVAL - 1)); + assertFalse(mLimiter.isRateLimited(mTestStartTime + ALLOWED_ALERT_INTERVAL)); + } + + @Test + public void testAllowedDisallowedBeforeSecond() throws Exception { + assertFalse(mLimiter.isRateLimited(mTestStartTime)); + assertTrue(mLimiter.isRateLimited(mTestStartTime + ALLOWED_ALERT_INTERVAL - 1)); + } + + @Test + public void testDisallowedTimePast() throws Exception { + assertFalse(mLimiter.isRateLimited(mTestStartTime)); + assertTrue(mLimiter.isRateLimited(mTestStartTime - ALLOWED_ALERT_INTERVAL)); + } +} diff --git a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java index ae9827428179..807703b95a63 100644 --- a/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java +++ b/services/tests/notification/src/com/android/server/notification/BuzzBeepBlinkTest.java @@ -23,6 +23,7 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; @@ -76,6 +77,8 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { @Mock android.media.IRingtonePlayer mRingtonePlayer; @Mock Light mLight; @Mock Handler mHandler; + @Mock + NotificationUsageStats mUsageStats; private NotificationManagerService mService; private String mPkg = "com.android.server.notification"; @@ -115,6 +118,8 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { when(mAudioManager.getStreamVolume(anyInt())).thenReturn(10); when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL); + when(mUsageStats.isAlertRateLimited(any())).thenReturn(false); + mService = new NotificationManagerService(getContext()); mService.setAudioManager(mAudioManager); mService.setVibrator(mVibrator); @@ -123,6 +128,7 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { mService.setLights(mLight); mService.setScreenOn(false); mService.setFallbackVibrationPattern(FALLBACK_VIBRATION_PATTERN); + mService.setUsageStats(mUsageStats); } // @@ -806,6 +812,39 @@ public class BuzzBeepBlinkTest extends NotificationTestCase { verifyNeverBeep(); } + @Test + public void testRepeatedSoundOverLimitMuted() throws Exception { + when(mUsageStats.isAlertRateLimited(any())).thenReturn(true); + + NotificationRecord r = getBeepyNotification(); + + mService.buzzBeepBlinkLocked(r); + verifyNeverBeep(); + } + + @Test + public void testPostingSilentNotificationDoesNotAffectRateLimiting() throws Exception { + NotificationRecord r = getQuietNotification(); + mService.buzzBeepBlinkLocked(r); + + verify(mUsageStats, never()).isAlertRateLimited(any()); + } + + @Test + public void testCrossUserSoundMuted() throws Exception { + final Notification n = new Builder(getContext(), "test") + .setSmallIcon(android.R.drawable.sym_def_app_icon).build(); + + int userId = mUser.getIdentifier() + 1; + StatusBarNotification sbn = new StatusBarNotification(mPkg, mPkg, 0, mTag, mUid, + mPid, n, UserHandle.of(userId), null, System.currentTimeMillis()); + NotificationRecord r = new NotificationRecord(getContext(), sbn, + new NotificationChannel("test", "test", IMPORTANCE_HIGH)); + + mService.buzzBeepBlinkLocked(r); + verifyNeverBeep(); + } + static class VibrateRepeatMatcher implements ArgumentMatcher<VibrationEffect> { private final int mRepeatIndex; diff --git a/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java index a356ae0337e2..b603a02c8ac6 100644 --- a/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/notification/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -50,6 +50,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.content.pm.ParceledListSlice; import android.graphics.Color; +import android.media.AudioManager; import android.os.Binder; import android.os.Process; import android.os.UserHandle; @@ -103,6 +104,8 @@ public class NotificationManagerServiceTest extends NotificationTestCase { File mFile; @Mock private NotificationUsageStats mUsageStats; + @Mock + private AudioManager mAudioManager; private NotificationChannel mTestNotificationChannel = new NotificationChannel( TEST_CHANNEL_ID, TEST_CHANNEL_ID, NotificationManager.IMPORTANCE_DEFAULT); @Mock @@ -153,6 +156,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { .thenReturn(applicationInfo); final LightsManager mockLightsManager = mock(LightsManager.class); when(mockLightsManager.getLight(anyInt())).thenReturn(mock(Light.class)); + when(mAudioManager.getRingerModeInternal()).thenReturn(AudioManager.RINGER_MODE_NORMAL); // Use this testable looper. mTestableLooper = TestableLooper.get(this); @@ -174,6 +178,7 @@ public class NotificationManagerServiceTest extends NotificationTestCase { throw e; } } + mNotificationManagerService.setAudioManager(mAudioManager); // Tests call directly into the Binder. mBinderService = mNotificationManagerService.getBinderService(); diff --git a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java index 5dd42dd21c90..fba89d164762 100644 --- a/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java +++ b/tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java @@ -129,6 +129,24 @@ public class NotificationTestList extends TestActivity mNM.notify(7001, n); } }, + new Test("repeated") { + public void run() + { + for (int i = 0; i < 50; i++) { + Notification n = new Notification.Builder(NotificationTestList.this, + "default") + .setSmallIcon(R.drawable.icon2) + .setContentTitle("Default priority") + .build(); + mNM.notify("default", 7004, n); + try { + Thread.sleep(100); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + }, new Test("Post a group") { public void run() { |