Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29b7872b authored by John Spurlock's avatar John Spurlock
Browse files

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
parent e03e2456

services/core/java/com/android/server/notification/ZenModeHelper.java

+4 −1
Original line number Diff line number Diff line
@@ -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;