commit 46d5355af96d582b81d6fae0ff1d3ceb745863f5
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 11 22:29:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 11 22:29:47 2018 +0000
tree cf4bceb75726ea1b5de50563afe30e355e4b351b
parent 1d01cf654baab4f1d6c3266df822cac6f51a67f3
parent 2a6e1b0211e3337931c65a33e07c344719ca4328

Merge "AudioFlinger: improve purgeStaleEffects_l thread-safety"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 39f04fb..91f4d37 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2569,6 +2569,7 @@
 
     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 @@
     }
     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);