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

Commit 18265202 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-dev

parents a147c17a 0add0fd0

services/audiopolicy/AudioPolicyManager.cpp

+2 −5
Original line number Diff line number Diff line
@@ -2650,13 +2650,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);

        }

    }

}