commit b2b01c678de5a248ad89b9d83cbc63a7abb42e6c
author Andy Hung <hunga@google.com> Tue Apr 23 13:56:19 2024 -0700
committer Andy Hung <hunga@google.com> Wed Jun 05 13:43:55 2024 -0700
tree 7afcd3843cea0d92478b279d0064f6b68b8b8882
parent a4f686d469f268f6683bc29919b5b44ff55333ef

AudioFlinger: Ensure RecordTrack dtor called outside lock

Test: atest AudioRecordTest
Bug: 329604636
Merged-In: I424459debe8fef4bdb5e112ff71d5383d4ff555f
Change-Id: I424459debe8fef4bdb5e112ff71d5383d4ff555f

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 9bbddf6..dc90ef5 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -8194,6 +8194,7 @@
     for (int64_t loopCount = 0;; ++loopCount) {  // loopCount used for statistics tracking
         // Note: these sp<> are released at the end of the for loop outside of the mutex() lock.
         sp<IAfRecordTrack> activeTrack;
+        std::vector<sp<IAfRecordTrack>> oldActiveTracks;
         Vector<sp<IAfEffectChain>> effectChains;
 
         // activeTracks accumulates a copy of a subset of mActiveTracks
@@ -8243,7 +8244,9 @@
             bool doBroadcast = false;
             bool allStopped = true;
             for (size_t i = 0; i < size; ) {
-
+                if (activeTrack) {  // ensure track release is outside lock.
+                    oldActiveTracks.emplace_back(std::move(activeTrack));
+                }
                 activeTrack = mActiveTracks[i];
                 if (activeTrack->isTerminated()) {
                     if (activeTrack->isFastTrack()) {