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

Commit 1d9fbfd8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "audio policy manager: fix BT SCO stream mute" into rvc-qpr-dev am: 75f20e19 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/12820562

Change-Id: Id8ac86ffcb91652ea570b1541704337b4b83af0d
parents 8e654fb2 75f20e19

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −3
Original line number Diff line number Diff line
@@ -6167,9 +6167,8 @@ status_t AudioPolicyManager::checkAndSetVolume(IVolumeCurves &curves, 


    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;

    }