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

Commit e56fc185 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 

am: 311b6040

Change-Id: If74df49e6dd7fec4186fc983b2457d416ec480fa
parents 48679ec8 311b6040

services/audioflinger/AudioFlinger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2597,6 +2597,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) {
@@ -2606,6 +2607,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);