commit a5a6788d8eff3c8808e8816055f0fca5a873b950
author Eric Laurent <elaurent@google.com> Fri Jun 21 10:41:31 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 21 10:41:31 2019 -0700
tree e57021acd4e7bef6d828bab942a46e5c713336e2
parent 1c388a30c1ca41ecf523eaa1ab5613b4bb11abc9
parent a426cf1c3d42d2e17212bd0aa5fbfe7517ad3284

Merge "audio policy: mute call RX when SCO volume is 0" into qt-dev
am: a426cf1c3d

Change-Id: I9a3c12a4e92d8729763e342a7f0f7f868056ec65

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 3ca7591..a6730fc 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -5855,11 +5855,11 @@
 
     if (isVoiceVolSrc || isBtScoVolSrc) {
         float voiceVolume;
-        // Force voice volume to max for bluetooth SCO as volume is managed by the headset
+        // Force voice volume to max or mute for Bluetooth SCO as other attenuations are managed by the headset
         if (isVoiceVolSrc) {
             voiceVolume = (float)index/(float)curves.getVolumeIndexMax();
         } else {
-            voiceVolume = 1.0;
+            voiceVolume = index == 0 ? 0.0 : 1.0;
         }
         if (voiceVolume != mLastVoiceVolume) {
             mpClientInterface->setVoiceVolume(voiceVolume, delayMs);