diff options
author | Eric Laurent <elaurent@google.com> | 2014-10-08 07:50:58 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 07:50:58 +0000 |
commit | d87131038bf79473998e9bf73a2710b5b6c65070 (patch) | |
tree | abc0bc2ebf5a1386c4c563639b1a15909dce4a69 /media | |
parent | 4fe73b54b4e44cee7ebed99fb171c1368298c5d9 (diff) | |
parent | 58202e1d7e4d244e1d93699c840d200a6056d918 (diff) | |
download | frameworks_av-d87131038bf79473998e9bf73a2710b5b6c65070.zip frameworks_av-d87131038bf79473998e9bf73a2710b5b6c65070.tar.gz frameworks_av-d87131038bf79473998e9bf73a2710b5b6c65070.tar.bz2 |
am 58202e1d: am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev
* commit '58202e1d7e4d244e1d93699c840d200a6056d918':
AudioTrack: fix AudioTrackThread crash upon exit
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/AudioTrack.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ bool AudioTrack::AudioTrackThread::threadLoop() return true; } } + if (exitPending()) { + return false; + } nsecs_t ns = mReceiver.processAudioBuffer(); switch (ns) { case 0: |