diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-13 15:49:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 15:49:32 +0000 |
| commit | e1d0188b6954bd42160cbb1e9445e08c7c9c0ae3 (patch) | |
| tree | 7dd9b0c670f761f80e1d845804891be0c53eafd4 | |
| parent | 99bd704f1c6bb4b818e6521ca41a70a2ec2245f4 (diff) | |
| parent | 05715ecd4c31faaf7167851dc32cb6360202e97a (diff) | |
| download | frameworks_base-e1d0188b6954bd42160cbb1e9445e08c7c9c0ae3.zip frameworks_base-e1d0188b6954bd42160cbb1e9445e08c7c9c0ae3.tar.gz frameworks_base-e1d0188b6954bd42160cbb1e9445e08c7c9c0ae3.tar.bz2 | |
Merge "Zen: Map external ringer mode = silent to zen = alarms." into mnc-dev
| -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 7886b7a..ce7ea5e 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -560,10 +560,10 @@ public class ZenModeHelper { case AudioManager.RINGER_MODE_SILENT: if (isChange) { if (mZenMode == Global.ZEN_MODE_OFF) { - newZen = Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; + newZen = Global.ZEN_MODE_ALARMS; } ringerModeInternalOut = isVibrate ? AudioManager.RINGER_MODE_VIBRATE - : AudioManager.RINGER_MODE_NORMAL; + : AudioManager.RINGER_MODE_SILENT; } else { ringerModeInternalOut = ringerModeInternal; } |