Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d4c45ae authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

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

Change-Id: I3ed4cbbbb2c79d62e786cfebe44766f11bac8a26
parents fe7a6971 2a70911d

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -8478,9 +8478,11 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 
    }



    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;