commit be2664dac34a6a9d9f754d4097b32158d4947cd2
author Eric Laurent <elaurent@google.com> Mon May 19 15:32:11 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 19 15:32:11 2014 +0000
tree 3815c24d38068321fa75f286737bfc71908deaf3
parent 6b787cb8ddde9d411cab0964062d5d942a710ff8
parent 4c9bde7a3e636d3ecccd7905d142dbbb80e977a0

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

* commit '4c9bde7a3e636d3ecccd7905d142dbbb80e977a0':
  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();
 }