diff options
| author | John Spurlock <jspurlock@google.com> | 2015-05-13 11:19:19 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2015-05-13 11:19:19 -0400 |
| commit | 05715ecd4c31faaf7167851dc32cb6360202e97a (patch) | |
| tree | d10b469d6f4fd0d7905020973dd10acac653ce8f | |
| parent | e7a835bc9d2af1fcdd1a645df77388048ceb1f66 (diff) | |
| download | frameworks_base-05715ecd4c31faaf7167851dc32cb6360202e97a.zip frameworks_base-05715ecd4c31faaf7167851dc32cb6360202e97a.tar.gz frameworks_base-05715ecd4c31faaf7167851dc32cb6360202e97a.tar.bz2 | |
Zen: Map external ringer mode = silent to zen = alarms.
Bug: 21109517
Change-Id: I0e9506dad05ce4edf709ee879367b9f6aeba8dfd
| -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; } |