diff options
| author | Eric Laurent <elaurent@google.com> | 2014-08-06 00:37:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:34:22 +0000 |
| commit | 92ce4715315bddd158c7d4028556632f0547e3b9 (patch) | |
| tree | 3d57deb9798654f163f4f04764c63ddc94b55298 /services/audioflinger | |
| parent | 1c8d1e4079f2b8efd71423158e7f298cf1dc2c31 (diff) | |
| parent | cf817a2330936947df94c11859f48771f5596a59 (diff) | |
| download | frameworks_av-92ce4715315bddd158c7d4028556632f0547e3b9.zip frameworks_av-92ce4715315bddd158c7d4028556632f0547e3b9.tar.gz frameworks_av-92ce4715315bddd158c7d4028556632f0547e3b9.tar.bz2 | |
Merge "audio: fix crashes upon USB device connection" into lmp-dev
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 2e2f533..2f65370 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -2639,12 +2639,9 @@ bool AudioFlinger::PlaybackThread::threadLoop() threadLoop_exit(); - // for DuplicatingThread, standby mode is handled by the outputTracks, otherwise ... - if (mType == MIXER || mType == DIRECT || mType == OFFLOAD) { - // put output stream into standby mode - if (!mStandby) { - mOutput->stream->common.standby(&mOutput->stream->common); - } + if (!mStandby) { + threadLoop_standby(); + mStandby = true; } releaseWakeLock(); |