diff options
| author | John Spurlock <jspurlock@google.com> | 2014-12-11 18:34:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 18:34:14 +0000 |
| commit | 6f9a71729f6ba7521ed8461ec8b556a8907743b1 (patch) | |
| tree | c1ef378f3fbfdaf5c73b0afbed1da4951ecdb915 /services | |
| parent | 911bceab1ead02fde9ccb6fe2651fee13aca817e (diff) | |
| parent | 0537caa1e05a2f60e747559e5251f5771737c54f (diff) | |
| download | frameworks_base-6f9a71729f6ba7521ed8461ec8b556a8907743b1.zip frameworks_base-6f9a71729f6ba7521ed8461ec8b556a8907743b1.tar.gz frameworks_base-6f9a71729f6ba7521ed8461ec8b556a8907743b1.tar.bz2 | |
am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev
* commit '0537caa1e05a2f60e747559e5251f5771737c54f':
Zen: Leave zen=none on manual ringer mode stream volume changes.
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/notification/ZenModeHelper.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 31d5cd7..0f9a59b 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -347,7 +347,10 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate { break; case AudioManager.RINGER_MODE_VIBRATE: case AudioManager.RINGER_MODE_NORMAL: - if (mZenMode != Global.ZEN_MODE_OFF) { + if (isChange && ringerModeOld == AudioManager.RINGER_MODE_SILENT + && mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS) { + newZen = Global.ZEN_MODE_OFF; + } else if (mZenMode != Global.ZEN_MODE_OFF) { ringerModeExternalOut = AudioManager.RINGER_MODE_SILENT; } break; |