Merge "Fix theoretical race condition in addOutputTrack"

gkasten · Android (Google) Code Review · commit 0d07b6a55f82 · 2012-02-28T07:18:27.000-08:00
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
@@ -3239,6 +3239,7 @@ bool AudioFlinger::DuplicatingThread::threadLoop()
 
 void AudioFlinger::DuplicatingThread::addOutputTrack(MixerThread *thread)
 {
+    Mutex::Autolock _l(mLock);
     // FIXME explain this formula
     int frameCount = (3 * mFrameCount * mSampleRate) / thread->sampleRate();
     OutputTrack *outputTrack = new OutputTrack(thread,

Original file line number	Diff line number	Diff line change
`@@ -3239,6 +3239,7 @@ bool AudioFlinger::DuplicatingThread::threadLoop()`
`3239`	`3239`
`3240`	`3240`	`void AudioFlinger::DuplicatingThread::addOutputTrack(MixerThread *thread)`
`3241`	`3241`	`{`
	`3242`	`+ Mutex::Autolock _l(mLock);`
`3242`	`3243`	`// FIXME explain this formula`
`3243`	`3244`	`int frameCount = (3 * mFrameCount * mSampleRate) / thread->sampleRate();`
`3244`	`3245`	`OutputTrack *outputTrack = new OutputTrack(thread,`