Commit b347a021 authored Nov 03, 2020 by Treehugger Robot Committed by Automerger Merge Worker Nov 03, 2020

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

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

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

Change-Id: I4eb80caa4a017a4479e689f36bedf7549c2e276e

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -4068,7 +4068,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;
		}