summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2016-11-02 10:29:05 +0100
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-11-07 04:35:05 -0800
commitd84227cf8a4c9304c5bb05ae5195627606357737 (patch)
tree9142c5e8132082090bf9457f11a422c098af01af /services/core
parent17224324b86e0f5486741921355c29cd6baa0f51 (diff)
downloadframeworks_base-d84227cf8a4c9304c5bb05ae5195627606357737.zip
frameworks_base-d84227cf8a4c9304c5bb05ae5195627606357737.tar.gz
frameworks_base-d84227cf8a4c9304c5bb05ae5195627606357737.tar.bz2
Fix zen priority mode vibration logic.
Even if zen priority mode is active and vibration is allowed, we still want to keep notifications with score below the threshold silent. Change-Id: I0a60bbd787e7f98f721129902054ab37fb9f58a7
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/notification/NotificationManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index b2b6580..052d010 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2735,7 +2735,7 @@ public class NotificationManagerService extends SystemService {
boolean canBeep = readyForBeepOrBuzz && canInterrupt;
boolean canBuzz = readyForBeepOrBuzz &&
- (canInterrupt || mZenModeHelper.allowVibrationForNotifications());
+ (canInterrupt || (aboveThreshold && mZenModeHelper.allowVibrationForNotifications()));
boolean hasValidSound = false;
if (canBeep || canBuzz) {