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

Commit 961977fb 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 

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

Change-Id: I5dbbf013f4b053acdc99c73a7777d3bdd85fd04b
parents abec6cf4 f18982cc

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;

        }