From cafe86a9cb6625bb1ec6383e16e28e4c9e455f87 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Fri, 14 Aug 2015 09:34:50 -0700 Subject: Do not acknowledge flush() on start() for static tracks Bug: 22938515 Change-Id: I1de653de169a3fbbaa693da6057897ea57772447 --- services/audioflinger/Tracks.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'services') diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index f7da209..d058255 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -712,9 +712,12 @@ status_t AudioFlinger::PlaybackThread::Track::start(AudioSystem::sync_event_t ev // But in this case we know the mixer thread (whether normal mixer or fast mixer) // isn't looking at this track yet: we still hold the normal mixer thread lock, // and for fast tracks the track is not yet in the fast mixer thread's active set. - ServerProxy::Buffer buffer; - buffer.mFrameCount = 1; - (void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /*ackFlush*/); + // TODO: remove race condition on stop() followed by start(). + if (mSharedBuffer == 0) { // only streaming tracks use flush(). + ServerProxy::Buffer buffer; + buffer.mFrameCount = 1; + (void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /*ackFlush*/); + } } } else { status = BAD_VALUE; -- cgit v1.1