diff options
author | Eric Laurent <elaurent@google.com> | 2015-09-09 12:26:52 -0700 |
---|---|---|
committer | The Android Automerger <android-build@google.com> | 2015-09-09 14:58:08 -0700 |
commit | f84e11ac32ccc156284a9b9833f813f525457431 (patch) | |
tree | 8dcc576ee3043e251b5adda9212998a74d021d24 | |
parent | 1901c4fab6db36634f7fba7eef45e80b8ff7c7ae (diff) | |
download | frameworks_av-f84e11ac32ccc156284a9b9833f813f525457431.zip frameworks_av-f84e11ac32ccc156284a9b9833f813f525457431.tar.gz frameworks_av-f84e11ac32ccc156284a9b9833f813f525457431.tar.bz2 |
Revert "Do not acknowledge flush() on start() for static tracks"
This reverts commit cafe86a9cb6625bb1ec6383e16e28e4c9e455f87.
Bug: 23924093.
Change-Id: I186d1013b06a286eca93c30bb9b3545dc36695ff
-rw-r--r-- | services/audioflinger/Tracks.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index d058255..f7da209 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -712,12 +712,9 @@ 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. - // 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*/); - } + ServerProxy::Buffer buffer; + buffer.mFrameCount = 1; + (void) mAudioTrackServerProxy->obtainBuffer(&buffer, true /*ackFlush*/); } } else { status = BAD_VALUE; |