commit fff9c8aa87a7c03e063cf6adeb4c63b895b6d145
author Phil Burk <philburk@google.com> Wed Dec 02 14:01:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 02 14:01:26 2020 +0000
tree 6354ae133efd160933af930063723f9559bfd7a2
parent 75f20e195a2c460162cc85f733dcbd6a6a3908c7
parent f2d8470b1c8efe422f73adf682e7858810d7fa4a

Merge "aaudio: use strong pointer to protect callback" into rvc-qpr-dev

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 07e80d1..a592dea 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -6147,9 +6147,8 @@
 
     float volumeDb = computeVolume(curves, volumeSource, index, deviceTypes);
     if (outputDesc->isFixedVolume(deviceTypes) ||
-            // Force VoIP volume to max for bluetooth SCO
-
-            ((isVoiceVolSrc || isBtScoVolSrc) &&
+            // Force VoIP volume to max for bluetooth SCO device except if muted
+            (index != 0 && (isVoiceVolSrc || isBtScoVolSrc) &&
                     isSingleDeviceType(deviceTypes, audio_is_bluetooth_out_sco_device))) {
         volumeDb = 0.0f;
     }