commit dbbd5b860a3a26bea3376410f75f27530d9cd10b
author Eric Laurent <elaurent@google.com> Mon Jul 02 12:43:14 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 02 12:43:14 2012 -0700
tree 6ee3b601745dc065689b8db0d7f3f3171f5e57b3
parent 651f9e7c972b58a49066081187161268bcf9237a
parent 109347d421413303eb1678dd9e2aa9d40acf89d2

am 109347d4: audioflinger: fix regression in attachAuxEffect().

* commit '109347d421413303eb1678dd9e2aa9d40acf89d2':
  audioflinger: fix regression in attachAuxEffect().

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index abe0293..aab9984 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -4696,11 +4696,8 @@
         Mutex::Autolock _l(af->mLock);
 
         sp<PlaybackThread> srcThread = af->getEffectThread_l(AUDIO_SESSION_OUTPUT_MIX, EffectId);
-        if (srcThread == 0) {
-            return INVALID_OPERATION;
-        }
 
-        if (EffectId != 0 && playbackThread != srcThread.get()) {
+        if (EffectId != 0 && srcThread != 0 && playbackThread != srcThread.get()) {
             Mutex::Autolock _dl(playbackThread->mLock);
             Mutex::Autolock _sl(srcThread->mLock);
             sp<EffectChain> chain = srcThread->getEffectChain_l(AUDIO_SESSION_OUTPUT_MIX);