diff options
| author | Eric Laurent <elaurent@google.com> | 2014-10-08 05:13:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 05:13:12 +0000 |
| commit | 58202e1d7e4d244e1d93699c840d200a6056d918 (patch) | |
| tree | be4a41ecc54ddf83d9d5a3927745132f1a789bd2 | |
| parent | 7c6977c42da29bf47e44aab55d3b2044bf9b442d (diff) | |
| parent | ce26e9d13da7a4a4443b9be775bb12fb3ac97d23 (diff) | |
| download | frameworks_av-58202e1d7e4d244e1d93699c840d200a6056d918.zip frameworks_av-58202e1d7e4d244e1d93699c840d200a6056d918.tar.gz frameworks_av-58202e1d7e4d244e1d93699c840d200a6056d918.tar.bz2 | |
am ce26e9d1: Merge "AudioTrack: fix AudioTrackThread crash upon exit" into lmp-dev
* commit 'ce26e9d13da7a4a4443b9be775bb12fb3ac97d23':
AudioTrack: fix AudioTrackThread crash upon exit
| -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: |