diff options
| author | John Spurlock <jspurlock@google.com> | 2015-02-12 22:58:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 22:58:44 +0000 |
| commit | e4049b6d36ded6ec808be5f884248772a4059a72 (patch) | |
| tree | 1a85a6bf0eb64d004ed4076ca7315380e59b705c /services | |
| parent | b1e80278f80585a1c3f46dbc578bbbafbcbd80c1 (diff) | |
| parent | f45e5dbf599a0043d7f6576f20eafb2c1c157204 (diff) | |
| download | frameworks_base-e4049b6d36ded6ec808be5f884248772a4059a72.zip frameworks_base-e4049b6d36ded6ec808be5f884248772a4059a72.tar.gz frameworks_base-e4049b6d36ded6ec808be5f884248772a4059a72.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.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:"); |