diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-12-09 00:14:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 00:14:16 +0000 |
| commit | 54a6b2e104dc72bc898ae81b8928119108c3f4d1 (patch) | |
| tree | 1419cd4063aaf8caa336009d69e9728556be8933 /media | |
| parent | ce48b3a821f0c17aa68b114d964a26fce22cdd49 (diff) | |
| parent | 56335ae2978765e3bbc510468d4812b691545d04 (diff) | |
| download | frameworks_av-54a6b2e104dc72bc898ae81b8928119108c3f4d1.zip frameworks_av-54a6b2e104dc72bc898ae81b8928119108c3f4d1.tar.gz frameworks_av-54a6b2e104dc72bc898ae81b8928119108c3f4d1.tar.bz2 | |
am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed"
* commit '56335ae2978765e3bbc510468d4812b691545d04':
Prevent ANR when AudioTrack is paused or re-routed
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrackShared.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp index eec025e..52533f5 100644 --- a/media/libmedia/AudioTrackShared.cpp +++ b/media/libmedia/AudioTrackShared.cpp @@ -301,6 +301,7 @@ void ClientProxy::binderDied() { audio_track_cblk_t* cblk = mCblk; if (!(android_atomic_or(CBLK_INVALID, &cblk->mFlags) & CBLK_INVALID)) { + android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex); // it seems that a FUTEX_WAKE_PRIVATE will not wake a FUTEX_WAIT, even within same process (void) syscall(__NR_futex, &cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1); @@ -311,6 +312,7 @@ void ClientProxy::interrupt() { audio_track_cblk_t* cblk = mCblk; if (!(android_atomic_or(CBLK_INTERRUPT, &cblk->mFlags) & CBLK_INTERRUPT)) { + android_atomic_or(CBLK_FUTEX_WAKE, &cblk->mFutex); (void) syscall(__NR_futex, &cblk->mFutex, mClientInServer ? FUTEX_WAKE_PRIVATE : FUTEX_WAKE, 1); } |