Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00901480 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Audioservice:do not supress music volume adjustment" am: 24f8ed2d am: 4c8aed88 

Change-Id: I10e4e4aec1a868bb663933e4ab2c34f231efd525
parents 21dd04ca 4c8aed88

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

+1 −1
Original line number Diff line number Diff line
@@ -6293,7 +6293,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