diff options
| author | John Spurlock <jspurlock@google.com> | 2014-09-09 20:40:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 20:40:03 +0000 |
| commit | 9ed0292a650eb52becc0c17e4001767065d325ca (patch) | |
| tree | cfb8803fb03f184946579822f50a13bd35f65970 /services | |
| parent | da6e6c888f81d3bd19ff1f3cf9b081b7f9b2a013 (diff) | |
| parent | 806dbae9e12f3875cf0def3da2f3c3c2b768a844 (diff) | |
| download | frameworks_base-9ed0292a650eb52becc0c17e4001767065d325ca.zip frameworks_base-9ed0292a650eb52becc0c17e4001767065d325ca.tar.gz frameworks_base-9ed0292a650eb52becc0c17e4001767065d325ca.tar.bz2 | |
Merge "Zen: Map transition to ringer-mode silent to "priority"." into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/notification/ZenModeHelper.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 5639dad..41d7fa8 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -301,8 +301,8 @@ public class ZenModeHelper { final int ringerMode = mAudioManager.getRingerMode(); int newZen = -1; if (ringerMode == AudioManager.RINGER_MODE_SILENT) { - if (mZenMode != Global.ZEN_MODE_NO_INTERRUPTIONS) { - newZen = Global.ZEN_MODE_NO_INTERRUPTIONS; + if (mZenMode == Global.ZEN_MODE_OFF) { + newZen = Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; } } else if ((ringerMode == AudioManager.RINGER_MODE_NORMAL || ringerMode == AudioManager.RINGER_MODE_VIBRATE) |