Merge "Audioservice:do not supress music volume adjustment" (24f8ed2d) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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