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

am: 36ee8e0244 Change-Id: I2599a62b1e1042b9cbcb6fcac2d754b8fb177758
2019-01-18 15:44:01 -08:00
parent fea7e9f20d 36ee8e0244
commit 1506f83f4f
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;