commit a01992a0675a06df7d0bbe7b977207dd0c33fdc7
author Eric Laurent <elaurent@google.com> Mon Jul 02 12:45:53 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 02 12:45:53 2012 -0700
tree 2256e1ce66e1754bbbe6e295b7487e9f72a6481a
parent dbabf8a7dfe3aa8bf0ed169220d2009d5891fef2
parent dbbd5b860a3a26bea3376410f75f27530d9cd10b

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

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

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index c89f1c9..02647e7 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);