commit e8c6c538a09a0b615d9cb7c3767482d78757de3b
author Andy Hung <hunga@google.com> Mon Jun 17 15:42:48 2024 -0700
committer Andy Hung <hunga@google.com> Mon Jun 17 16:05:10 2024 -0700
tree ce609bb343c75c59f4b2c4dbc6ee3539d4d7ab02
parent 75c0376961501a5c5af035fe9f845fe675d4f8b0

AudioFlinger: Ensure RecordTrack dtor called outside lock (pt 2)

Update RecordThread activeTrack handling.

Flag: EXEMPT bugfix
Test: atest AudioRecordTest
Bug: 329604636
Change-Id: I365ce3a63b2033325b659d60a3557db3c52e6575

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 66e89e4..66ec2ba 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -8670,6 +8670,9 @@
 
         // loop over each active track
         for (size_t i = 0; i < size; i++) {
+            if (activeTrack) {  // ensure track release is outside lock.
+                oldActiveTracks.emplace_back(std::move(activeTrack));
+            }
             activeTrack = activeTracks[i];
 
             // skip fast tracks, as those are handled directly by FastCapture