Merge "Update mStandby flag in RecordThread" into main am: 20e74209e8 am: a1c199d1d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3367822
Change-Id: I1a06963b698f889c873c318db9c72945040fcb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 32690ff..e4f08b9 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -8643,6 +8643,10 @@
timestampCorrectionEnabled = isTimestampCorrectionEnabled_l();
lockEffectChains_l(effectChains);
+ // We're exiting locked scope with non empty activeTracks, make sure
+ // that we're not in standby mode which we could have entered if some
+ // tracks were muted/unmuted.
+ mStandby = false;
}
// thread mutex is now unlocked, mActiveTracks unknown, activeTracks.size() > 0