Commit e108058a authored Oct 21, 2024 by Andy Hung Committed by Automerger Merge Worker Oct 21, 2024

Merge "libmediaplayerservice: Explicitly force callbacks to stop running" into main am: 31782d7c

media/libmediaplayerservice/MediaPlayerService.cpp

+9 −0

Original line number	Diff line number	Diff line
		@@ -2514,6 +2514,15 @@ void MediaPlayerService::AudioOutput::close()
		{
		Mutex::Autolock lock(mLock);
		track = mTrack;
		}

		// do not hold lock while joining.
		if (track) {
		track->stopAndJoinCallbacks();
		}

		{
		Mutex::Autolock lock(mLock);
		close_l(); // clears mTrack
		}
		// destruction of the track occurs outside of mutex.