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