commit ce473c32705e2d1c5fcc817198101e1220b3c8f7
author Eric Laurent <elaurent@google.com> Mon May 19 15:26:37 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 19 15:26:37 2014 +0000
tree 6f5bcda1e04e70b570dd4858b282d850fb2ed895
parent 3059e27d0e18a427f3c19889aac86ea31ec0d5d1
parent 56604aa3a56dc8e15532597a0a74b3c7b165e006

Merge "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 1da5147..69a1883 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -3951,7 +3951,10 @@
         mMixerStatus = MIXER_DRAIN_ALL;
         threadLoop_drain();
     }
-    mCallbackThread->exit();
+    if (mUseAsyncWrite) {
+        ALOG_ASSERT(mCallbackThread != 0);
+        mCallbackThread->exit();
+    }
     PlaybackThread::threadLoop_exit();
 }