commit 55b2e0ea6dfa0da2a6fbac9ce2307977c27bc423
author Eric Laurent <elaurent@google.com> Wed Oct 08 13:14:35 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 08 13:14:35 2014 +0000
tree d9b66a7f519cfa441eacf650f4b9424d84122ff1
parent eb3a80faa99e201c7b7b8ca9e29d8da45aa769d1
parent d87131038bf79473998e9bf73a2710b5b6c65070

am d8713103: am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev

* commit 'd87131038bf79473998e9bf73a2710b5b6c65070':
  AudioTrack: fix AudioTrackThread crash upon exit

media/libmedia/AudioTrack.cpp

diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index e3beba5..8e0704f 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -2244,6 +2244,9 @@
             return true;
         }
     }
+    if (exitPending()) {
+        return false;
+    }
     nsecs_t ns = mReceiver.processAudioBuffer();
     switch (ns) {
     case 0: