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

Commit f9a80c72 authored by Xin Li's avatar Xin Li Committed by Android (Google) Code Review
Browse files

Merge "Merge ab/AP4A.240925.013 into aosp-main-future" into aosp-main-future

parents 627e0700 fcb70c21

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+3 −1
Original line number Diff line number Diff line
@@ -8515,9 +8515,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;