diff options
| author | John Spurlock <jspurlock@google.com> | 2014-12-11 12:15:19 -0500 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-12-11 12:54:41 -0500 |
| commit | 29b7872bf454d61f849d32d4a7a50485aa9c282d (patch) | |
| tree | 180eb1f791f8ff6f8fd3b8dd65f80c2ada74da47 | |
| parent | e03e245610c7f406a6cc0de998d71313a285953a (diff) | |
| download | frameworks_base-29b7872bf454d61f849d32d4a7a50485aa9c282d.zip frameworks_base-29b7872bf454d61f849d32d4a7a50485aa9c282d.tar.gz frameworks_base-29b7872bf454d61f849d32d4a7a50485aa9c282d.tar.bz2 | |
Zen: Leave zen=none on manual ringer mode stream volume changes.
If the stream volume is changed from the api, leave zen=none
so as not to leave the system in an unexpected state.
Bug: 18084981
Change-Id: I857b3ff87ad4e2aa9aab479529caf13b819f854c
| -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; |