diff options
author | John Spurlock <jspurlock@google.com> | 2015-02-12 22:52:12 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 22:52:13 +0000 |
commit | f45e5dbf599a0043d7f6576f20eafb2c1c157204 (patch) | |
tree | a5b0c7a62990f5e23c1fc8f25d2c6fabba1e8fa7 /services/core | |
parent | b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9 (diff) | |
parent | f370177e94782a3c2d141015fc0d0203f08799a0 (diff) | |
download | frameworks_base-f45e5dbf599a0043d7f6576f20eafb2c1c157204.zip frameworks_base-f45e5dbf599a0043d7f6576f20eafb2c1c157204.tar.gz frameworks_base-f45e5dbf599a0043d7f6576f20eafb2c1c157204.tar.bz2 |
Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
Diffstat (limited to 'services/core')
-rw-r--r-- | services/core/java/com/android/server/notification/NotificationManagerService.java | 2 |
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:"); |