commit 205d17158cf9ef18186ec7ccc8f8f45703e40546
author Vlad Popa <pvlad@google.com> Mon Feb 06 08:18:08 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 06 08:18:08 2023 +0000
tree eb3db78adc1e10eed8d438b0f67a3e1b2a8893a1
parent 0e7a2e3cca6dfc6f79c701dae2526fb060761ea0
parent fce1086402c757bd2d68bbbdd5fb8d2e1b8ebec5

Merge "Fix possible deadlock between effect and af lock"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 8de900e..4ca8a8e 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -4080,11 +4080,6 @@
             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 @@
         // 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) {