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

Commit c1b0d49c authored by zunkyu.lee's avatar zunkyu.lee Committed by Android Git Automerger
Browse files

am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed 

* commit '82a69ea8':
  Prevent ANR when AudioTrack is paused or re-routed
parents 0b672c8b 82a69ea8

media/libmedia/AudioTrackShared.cpp

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,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);
@@ -317,6 +318,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);

    }