Merge "Audioservice:do not supress music volume adjustment"

am: 24f8ed2d98

Change-Id: Ic0316d1a821a0e3c03e5784736e5a6e4266110d3
This commit is contained in:
Jean-Michel Trivi
2020-01-14 19:04:00 -08:00
committed by android-build-merger

View File

@@ -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