commit 07137c344060e349593cb55a667d71d5e2382cc3
author John Spurlock <jspurlock@google.com> Thu Feb 12 23:19:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Feb 12 23:19:03 2015 +0000
tree 13d10d922795b545f5124524ed78967990367c62
parent 1781b7ed133b07574d33332f822d1bfe34748abe
parent 1be4b702f531363903b46a88fc3d1603fb19c3ef

am 1be4b702: am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev

* commit '1be4b702f531363903b46a88fc3d1603fb19c3ef':
  NoMan: Initialize filter value reported to listeners.

services/core/java/com/android/server/notification/NotificationManagerService.java

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 @@
             mDisableNotificationEffects = true;
         }
         mZenModeHelper.readZenModeFromSetting();
+        mInterruptionFilter = mZenModeHelper.getZenModeListenerInterruptionFilter();
 
         mUserProfiles.updateCache(getContext());
         listenForCallState();
@@ -1671,6 +1672,7 @@
 
             if (filter == null || zenOnly) {
                 pw.println("\n  Zen Mode:");
+                pw.print("    mInterruptionFilter="); pw.println(mInterruptionFilter);
                 mZenModeHelper.dump(pw, "    ");
 
                 pw.println("\n  Zen Log:");