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

Commit 97a2be86 authored by John Spurlock's avatar John Spurlock Committed by android-build-merger
Browse files

am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume... 

am 0537caa1: Merge "Zen: Leave zen=none on manual ringer mode stream volume changes." into lmp-mr1-dev
automerge: 6f9a7172

* commit '6f9a7172':
  Zen: Leave zen=none on manual ringer mode stream volume changes.
parents d1aa67b8 6f9a7172

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;