Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54a6b2e1 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed" 

* commit '56335ae2':
  Prevent ANR when AudioTrack is paused or re-routed
parents ce48b3a8 56335ae2

media/libmedia/AudioTrackShared.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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);

    }