diff options
| author | Eric Laurent <elaurent@google.com> | 2015-08-20 19:30:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:30:48 +0000 |
| commit | 899ad39be5466d341f648e4a1584db64d99555ca (patch) | |
| tree | 7e6301cbb2f40e8560c37f9d6280b13c82f0b97c /services/audioflinger/Threads.cpp | |
| parent | d9f0be89f812883128683776498b3387abbf63b5 (diff) | |
| parent | ba20a08670dfb3bb0ab58b0e1e48fe1178c7cfcb (diff) | |
| download | frameworks_av-899ad39be5466d341f648e4a1584db64d99555ca.zip frameworks_av-899ad39be5466d341f648e4a1584db64d99555ca.tar.gz frameworks_av-899ad39be5466d341f648e4a1584db64d99555ca.tar.bz2 | |
am ba20a086: am bc167f83: resolved conflicts for merge of 84fb58bd to lmp-mr1-dev
* commit 'ba20a08670dfb3bb0ab58b0e1e48fe1178c7cfcb':
DO NOT MERGE - audio flinger: fix fuzz test crash
Diffstat (limited to 'services/audioflinger/Threads.cpp')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 51025fe..e5b6661 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -4864,10 +4864,13 @@ void AudioFlinger::DuplicatingThread::removeOutputTrack(MixerThread *thread) mOutputTracks[i]->destroy(); mOutputTracks.removeAt(i); updateWaitTime_l(); + if (thread->getOutput() == mOutput) { + mOutput = NULL; + } return; } } - ALOGV("removeOutputTrack(): unkonwn thread: %p", thread); + ALOGV("removeOutputTrack(): unknown thread: %p", thread); } // caller must hold mLock |