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

Commit 61e22fed authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "[b/109850442]Fail to adjust volume when connect Ampplifier.]" am: 36ee8e02 

am: 1506f83f

Change-Id: I61ce181f8800331900926bcc29d5a066e183feef
parents b67858ba 1506f83f

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -1574,7 +1574,9 @@ public class AudioService extends IAudioService.Stub 




        // For notifications/ring, show the ui before making any adjustments

        // For notifications/ring, show the ui before making any adjustments

        // Don't suppress mute/unmute requests

        // Don't suppress mute/unmute requests

        if (mVolumeController.suppressAdjustment(resolvedStream, flags, isMute)) {

        // Don't suppress adjustments for single volume device

        if (mVolumeController.suppressAdjustment(resolvedStream, flags, isMute)

                && !mIsSingleVolume) {

            direction = 0;

            direction = 0;

            flags &= ~AudioManager.FLAG_PLAY_SOUND;

            flags &= ~AudioManager.FLAG_PLAY_SOUND;

            flags &= ~AudioManager.FLAG_VIBRATE;

            flags &= ~AudioManager.FLAG_VIBRATE;