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

Commit 82bb9d95 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ZenModeHelper: To pass android.media.cts.AudioManagerTest."

parents de550cea d14b675e

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

+3 −1
Original line number Diff line number Diff line
@@ -380,7 +380,9 @@ public class ZenModeHelper implements AudioManagerInternal.RingerModeDelegate { 
        switch (ringerModeNew) {

            case AudioManager.RINGER_MODE_SILENT:

                if (isChange) {

                    if (mZenMode == Global.ZEN_MODE_OFF) {

                    if (mZenMode == Global.ZEN_MODE_OFF &&

                        mContext.getResources().getBoolean(com.android.internal.R.bool.config_setZenModeWhenSilentModeOn))

                    {

                        newZen = Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

                    }

                    ringerModeInternalOut = isVibrate ? AudioManager.RINGER_MODE_VIBRATE