am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed (9574b644) · Commits · e / os / android_frameworks_av

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);
		}