diff options
| author | Eric Laurent <elaurent@google.com> | 2014-02-07 17:03:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-07 17:03:19 +0000 |
| commit | c9583cba9913682e1c181675c6d0066292fb719d (patch) | |
| tree | 5725c26450c69cfed15b7650081cd699ce529e2f /services | |
| parent | 010c4c8ec50eb04ece15f792c508a3b869749310 (diff) | |
| parent | 0f02f265123b7ef2fd6ac09ff70cde26eb5559ad (diff) | |
| download | frameworks_av-c9583cba9913682e1c181675c6d0066292fb719d.zip frameworks_av-c9583cba9913682e1c181675c6d0066292fb719d.tar.gz frameworks_av-c9583cba9913682e1c181675c6d0066292fb719d.tar.bz2 | |
Merge "audioflinger: OffloadThread state fix"
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 24df473..00d14e8 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -4146,9 +4146,6 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::OffloadThread::prepareTr // if resume is received before pause is executed. if (!mStandby && (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) { mOutput->stream->pause(mOutput->stream); - if (!doHwPause) { - doHwResume = true; - } } if (mFlushPending) { flushHw_l(); @@ -4209,6 +4206,8 @@ void AudioFlinger::OffloadThread::flushHw_l() mBytesRemaining = 0; mPausedWriteLength = 0; mPausedBytesRemaining = 0; + mHwPaused = false; + if (mUseAsyncWrite) { // discard any pending drain or write ack by incrementing sequence mWriteAckSequence = (mWriteAckSequence + 2) & ~1; |