Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev

Browse Source
This commit is contained in:
John Spurlock
2014-12-11 18:27:09 +00:00
committed by Android (Google) Code Review
parent bde00a2b5c 29b7872bf4
commit 0537caa1e0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -347,7 +347,10 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate {
break; break;
case AudioManager.RINGER_MODE_VIBRATE: case AudioManager.RINGER_MODE_VIBRATE:
case AudioManager.RINGER_MODE_NORMAL: 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; ringerModeExternalOut = AudioManager.RINGER_MODE_SILENT;
} }
break; break;