Merge "Fix possible deadlock between effect and af lock" (205d1715) · Commits · e / os / android_frameworks_av

services/audioflinger/Threads.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -4080,11 +4080,6 @@ bool AudioFlinger::PlaybackThread::threadLoop()
		setHalLatencyMode_l();
		} // mLock scope ends

		if (!metadataUpdate.playbackMetadataUpdate.empty()) {
		mAudioFlinger->mMelReporter->updateMetadataForCsd(id(),
		metadataUpdate.playbackMetadataUpdate);
		}

		if (mBytesRemaining == 0) {
		mCurrentWriteLength = 0;
		if (mMixerStatus == MIXER_TRACKS_READY) {
		@@ -4275,6 +4270,11 @@ bool AudioFlinger::PlaybackThread::threadLoop()
		// enable changes in effect chain
		unlockEffectChains(effectChains);

		if (!metadataUpdate.playbackMetadataUpdate.empty()) {
		mAudioFlinger->mMelReporter->updateMetadataForCsd(id(),
		metadataUpdate.playbackMetadataUpdate);
		}

		if (!waitingAsyncCallback()) {
		// mSleepTimeUs == 0 means we must write to audio hardware
		if (mSleepTimeUs == 0) {