summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2015-02-12 22:58:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-12 22:58:14 +0000
commitdfc0a778d4b335a44367927079be1c4825feddaa (patch)
tree2c55cf4b891d535e2d465ebf8c965de259264092 /services
parent2d5b218143fe7e1c1179665a1cdfa3b27aa1496a (diff)
parentf45e5dbf599a0043d7f6576f20eafb2c1c157204 (diff)
downloadframeworks_base-dfc0a778d4b335a44367927079be1c4825feddaa.zip
frameworks_base-dfc0a778d4b335a44367927079be1c4825feddaa.tar.gz
frameworks_base-dfc0a778d4b335a44367927079be1c4825feddaa.tar.bz2
am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit 'f45e5dbf599a0043d7f6576f20eafb2c1c157204': NoMan: Initialize filter value reported to listeners.
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/notification/NotificationManagerService.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 02cacd9..f49d77d 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -931,6 +931,7 @@ public class NotificationManagerService extends SystemService {
mDisableNotificationEffects = true;
}
mZenModeHelper.readZenModeFromSetting();
+ mInterruptionFilter = mZenModeHelper.getZenModeListenerInterruptionFilter();
mUserProfiles.updateCache(getContext());
listenForCallState();
@@ -1671,6 +1672,7 @@ public class NotificationManagerService extends SystemService {
if (filter == null || zenOnly) {
pw.println("\n Zen Mode:");
+ pw.print(" mInterruptionFilter="); pw.println(mInterruptionFilter);
mZenModeHelper.dump(pw, " ");
pw.println("\n Zen Log:");