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

Commit 311b6040 authored by Mateusz Kaplon's avatar Mateusz Kaplon Committed by android-build-merger
Browse files

Merge "AudioFlinger: improve purgeStaleEffects_l thread-safety" am: 46d5355a 

am: 76630b81

Change-Id: Ia723ec2d5d013df34e8ddaaaafb623bd30360fa7
parents d381be59 76630b81

services/audioflinger/AudioFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2569,6 +2569,7 @@ void AudioFlinger::purgeStaleEffects_l() { 


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

        sp<PlaybackThread> t = mPlaybackThreads.valueAt(i);

        Mutex::Autolock _l(t->mLock);

        for (size_t j = 0; j < t->mEffectChains.size(); j++) {

            sp<EffectChain> ec = t->mEffectChains[j];

            if (ec->sessionId() > AUDIO_SESSION_OUTPUT_MIX) {
@@ -2578,6 +2579,7 @@ void AudioFlinger::purgeStaleEffects_l() { 
    }

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

        sp<RecordThread> t = mRecordThreads.valueAt(i);

        Mutex::Autolock _l(t->mLock);

        for (size_t j = 0; j < t->mEffectChains.size(); j++) {

            sp<EffectChain> ec = t->mEffectChains[j];

            chains.push(ec);