diff options
| author | 2020-11-03 01:58:58 +0000 | |
|---|---|---|
| committer | 2020-11-03 01:58:58 +0000 | |
| commit | b347a021081c883d1631d9610ada56cd124c7b86 (patch) | |
| tree | e1fdcd6a1f55de082be9bfc14f7660626785f7c5 | |
| parent | bde98cf8d0de1d425686b740df1dcd2b8e710090 (diff) | |
| parent | 71da7ee983fbfaa1d50361cd9a3a6049ae29e300 (diff) | |
Merge "Only play sound effects if stream is not muted." am: f18982cc19 am: 961977fbb7 am: 71da7ee983
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/36572
Change-Id: I4eb80caa4a017a4479e689f36bedf7549c2e276e
| -rwxr-xr-x | services/core/java/com/android/server/audio/AudioService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java index f6d89878c833..c3a454d5cc46 100755 --- a/services/core/java/com/android/server/audio/AudioService.java +++ b/services/core/java/com/android/server/audio/AudioService.java @@ -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; } |