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

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

Merge "DO NOT MERGE - audio policy: fix inifinite loop in clearAudioPatches()"

parents cdf06cd9 9bc2a6f2

services/audiopolicy/AudioPolicyManager.cpp

+2 −5
Original line number Diff line number Diff line
@@ -3452,13 +3452,10 @@ status_t AudioPolicyManager::setAudioPortConfig(const struct audio_port_config * 


void AudioPolicyManager::clearAudioPatches(uid_t uid)

{

    for (ssize_t i = 0; i < (ssize_t)mAudioPatches.size(); i++)  {

    for (ssize_t i = (ssize_t)mAudioPatches.size() - 1; i >= 0; i--)  {

        sp<AudioPatch> patchDesc = mAudioPatches.valueAt(i);

        if (patchDesc->mUid == uid) {

            // releaseAudioPatch() removes the patch from mAudioPatches

            if (releaseAudioPatch(mAudioPatches.keyAt(i), uid) == NO_ERROR) {

                i--;

            }

            releaseAudioPatch(mAudioPatches.keyAt(i), uid);

        }

    }

}