summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jean-Michel Trivi <jmtrivi@google.com> 2020-01-14 19:04:00 -0800
committer android-build-merger <android-build-merger@google.com> 2020-01-14 19:04:00 -0800
commit4c8aed88bc4bded7541abc7ceb2ccd4e2bd458a2 (patch)
tree1fa8d763afb2d103fcafbe92635590f0b5713aa5
parent06731657a28c58386b2a220aebab9d29935f41f6 (diff)
parent24f8ed2d98ebf4ab3739474c2fcfc6aa2abc8a69 (diff)
Merge "Audioservice:do not supress music volume adjustment"
am: 24f8ed2d98 Change-Id: Ic0316d1a821a0e3c03e5784736e5a6e4266110d3
-rw-r--r--services/core/java/com/android/server/audio/AudioService.java2
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 25fdf6447061..88a63f1aa06d 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -6292,7 +6292,7 @@ public class AudioService extends IAudioService.Stub
return false;
}
boolean suppress = false;
- if (resolvedStream == DEFAULT_VOL_STREAM_NO_PLAYBACK && mController != null) {
+ if (resolvedStream != AudioSystem.STREAM_MUSIC && mController != null) {
final long now = SystemClock.uptimeMillis();
if ((flags & AudioManager.FLAG_SHOW_UI) != 0 && !mVisible) {
// ui will become visible