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

Commit 3803ff3e authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

audio policy: correct force use touch sound delay am: e1f1cb58 

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

Change-Id: I7b8ecc463d043da5c9e479bf92a73654ba8f3ad7
parents 9447b48f e1f1cb58

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+4 −0
Original line number Diff line number Diff line
@@ -3172,6 +3172,8 @@ void AudioPolicyManager::updateCallAndOutputRouting(bool forceVolumeReeval, uint 
    if (mEngine->getPhoneState() == AUDIO_MODE_IN_CALL && hasPrimaryOutput()) {

        DeviceVector newDevices = getNewOutputDevices(mPrimaryOutput, true /*fromCache*/);

        waitMs = updateCallRouting(newDevices, delayMs);

        // Only apply special touch sound delay once

        delayMs = 0;

    }

    for (size_t i = 0; i < mOutputs.size(); i++) {

        sp<SwAudioOutputDescriptor> outputDesc = mOutputs.valueAt(i);
@@ -3181,6 +3183,8 @@ void AudioPolicyManager::updateCallAndOutputRouting(bool forceVolumeReeval, uint 
            // preventing the force re-routing in case of default dev that distinguishes on address.

            // Let's give back to engine full device choice decision however.

            waitMs = setOutputDevices(outputDesc, newDevices, !newDevices.isEmpty(), delayMs);

            // Only apply special touch sound delay once

            delayMs = 0;

        }

        if (forceVolumeReeval && !newDevices.isEmpty()) {

            applyStreamVolumes(outputDesc, newDevices.types(), waitMs, true);