Merge "[b/109850442]Fail to adjust volume when connect Ampplifier.]"

2019-01-18 23:30:27 +00:00
parent a879fd8b02 b77e13d50a
commit 36ee8e0244
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -1574,7 +1574,9 @@ public class AudioService extends IAudioService.Stub

        // For notifications/ring, show the ui before making any adjustments
        // 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;
            flags &= ~AudioManager.FLAG_PLAY_SOUND;
            flags &= ~AudioManager.FLAG_VIBRATE;