commit 5859b98476de3bbb4ae4dc00d4b2f010ca7897d3
author Eric Laurent <elaurent@google.com> Mon May 19 15:35:27 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 19 15:35:27 2014 +0000
tree 16d5e2f519ac3e3495a3639c9f7f901dc71deb23
parent 272b7f26c300d2029f278cf2af523cf94e513b89
parent be2664dac34a6a9d9f754d4097b32158d4947cd2

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

* commit 'be2664dac34a6a9d9f754d4097b32158d4947cd2':
  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 2d4e025..e9464c2 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4152,7 +4152,10 @@
         mMixerStatus = MIXER_DRAIN_ALL;
         threadLoop_drain();
     }
-    mCallbackThread->exit();
+    if (mUseAsyncWrite) {
+        ALOG_ASSERT(mCallbackThread != 0);
+        mCallbackThread->exit();
+    }
     PlaybackThread::threadLoop_exit();
 }