| commit | 150bbbc71adc612b45264ad7a5fa180e8deef4ef | [log] [tgz] |
|---|---|---|
| author | HW Lee <hwlee@google.com> | Thu May 24 10:59:40 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 24 10:59:40 2018 -0700 |
| tree | a00050208c87a40db933b74853a0adf55025830a | |
| parent | b1dd2d9b7b0a3da1db8d3e3c2a76509a53a316e9 [diff] | |
| parent | d4f615b1743d2810be6f83ebd4dc4c266c455dab [diff] |
Merge "audiopolicy: keep BT SCO vol at 0 dB on VoIP" into pi-dev am: cd182409e3 am: d4f615b174 Change-Id: I7985bc296c3c9a29fdfcbc066143c310052787b5
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index a35e6db..6a577ae 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5516,7 +5516,10 @@ } float volumeDb = computeVolume(stream, index, device); - if (outputDesc->isFixedVolume(device)) { + if (outputDesc->isFixedVolume(device) || + // Force VoIP volume to max for bluetooth SCO + ((stream == AUDIO_STREAM_VOICE_CALL || stream == AUDIO_STREAM_BLUETOOTH_SCO) && + (device & AUDIO_DEVICE_OUT_ALL_SCO) != 0)) { volumeDb = 0.0f; }