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

Commit 718808ab authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "audiopolicy: Fix to close all opened inputs in closeAllInputs"

parents 3e9f240c bfeca7f4

policy_hal/AudioPolicyManager.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1913,8 +1913,8 @@ status_t AudioPolicyManagerCustom::stopInput(audio_io_handle_t input, 
void AudioPolicyManagerCustom::closeAllInputs() {

    bool patchRemoved = false;



    for(size_t input_index = 0; input_index < mInputs.size(); input_index++) {

        sp<AudioInputDescriptor> inputDesc = mInputs.valueAt(input_index);

    for(size_t input_index = mInputs.size(); input_index > 0; input_index--) {

        sp<AudioInputDescriptor> inputDesc = mInputs.valueAt(input_index-1);

        ssize_t patch_index = mAudioPatches.indexOfKey(inputDesc->mPatchHandle);

        if (patch_index >= 0) {

            sp<AudioPatch> patchDesc = mAudioPatches.valueAt(patch_index);
@@ -1925,8 +1925,8 @@ void AudioPolicyManagerCustom::closeAllInputs() { 
        if ((inputDesc->mIsSoundTrigger) && (mInputs.size() == 1)) {

            ALOGD("Do not close sound trigger input handle");

        } else {

            mpClientInterface->closeInput(mInputs.keyAt(input_index));

            mInputs.removeItem(mInputs.keyAt(input_index));

            mpClientInterface->closeInput(mInputs.keyAt(input_index-1));

            mInputs.removeItem(mInputs.keyAt(input_index-1));

        }

    }

    nextAudioPortGeneration();