commit 4c9bde7a3e636d3ecccd7905d142dbbb80e977a0
author Eric Laurent <elaurent@google.com> Mon May 19 15:28:51 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 19 15:28:51 2014 +0000
tree 459c7793a25bb047415e25dea6e6fd87c103a8de
parent 1b8b8793c0e86865df456c3d26f969b1498041db
parent ce473c32705e2d1c5fcc817198101e1220b3c8f7

am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode"

* commit 'ce473c32705e2d1c5fcc817198101e1220b3c8f7':
  Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index cac785a..0f2a445 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3952,7 +3952,10 @@
         mMixerStatus = MIXER_DRAIN_ALL;
         threadLoop_drain();
     }
-    mCallbackThread->exit();
+    if (mUseAsyncWrite) {
+        ALOG_ASSERT(mCallbackThread != 0);
+        mCallbackThread->exit();
+    }
     PlaybackThread::threadLoop_exit();
 }