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

Commit 71da7ee9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only play sound effects if stream is not muted." am: f18982cc am: 961977fb 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/36572

Change-Id: I1cb7407a615b07dc5c7d6ed715dbe01690c45381
parents 43f102ed 961977fb

services/core/java/com/android/server/audio/AudioService.java

+1 −1
Original line number Diff line number Diff line
@@ -3987,7 +3987,7 @@ public class AudioService extends IAudioService.Stub 
    /** @see AudioManager#playSoundEffect(int, float) */

    public void playSoundEffectVolume(int effectType, float volume) {

        // do not try to play the sound effect if the system stream is muted

        if (isStreamMutedByRingerOrZenMode(STREAM_SYSTEM)) {

        if (isStreamMute(STREAM_SYSTEM)) {

            return;

        }