commit 0d4c45aed0b630a88a48f5376b1238711b47ce4f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 08 00:12:44 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Oct 08 00:12:44 2024 +0000
tree 8f319de85abf02dddc6d8461b288e09dc42cc7c6
parent fe7a69712b41be563a2638ca6be5b8c154e100b9
parent 2a70911d4a7862ebe73b831a96b3d51a2369fc7e

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29704366'] into 24Q4-release.

Change-Id: I3ed4cbbbb2c79d62e786cfebe44766f11bac8a26

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index d2fa42b..3d46041 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -8478,9 +8478,11 @@
     }
 
     float volumeDb = computeVolume(curves, volumeSource, index, deviceTypes);
+    const VolumeSource dtmfVolSrc = toVolumeSource(AUDIO_STREAM_DTMF, false);
     if (outputDesc->isFixedVolume(deviceTypes) ||
             // Force VoIP volume to max for bluetooth SCO/BLE device except if muted
-            (index != 0 && (isVoiceVolSrc || isBtScoVolSrc) &&
+            (index != 0 && (isVoiceVolSrc || isBtScoVolSrc
+                        || (isInCall() && (dtmfVolSrc == volumeSource))) &&
                     (isSingleDeviceType(deviceTypes, audio_is_bluetooth_out_sco_device)
                     || isSingleDeviceType(deviceTypes, audio_is_ble_out_device)))) {
         volumeDb = 0.0f;