commit 9d83c2cd55ebd0cfeb94ac229c0568d60925ce00
author Andy Hung <hunga@google.com> Mon Mar 27 18:32:07 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Mar 27 18:32:07 2023 +0000
tree 348aecc18038dd6f73fbd0f7e1ef24c0a3121bfb
parent 943db3f3518d754fe24c24d51f84861e9b503c98
parent aee1631ff0c1633849abaf3be7b494af479fbc1b

Merge "AudioFlinger:  Fix destroyTrack_l sequencing for Direct tracks" am: 1d365d2f96 am: 0c573ca638 am: aee1631ff0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2498479

Change-Id: Ida77e49a8a3318695a59acb672c1f790bdb0c236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index e113efb..661550a 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2901,6 +2901,9 @@
     if (!trackActive) {
         removeTrack_l(track);
     } else if (track->isFastTrack() || track->isOffloaded() || track->isDirect()) {
+        if (track->isPausePending()) {
+            track->pauseAck();
+        }
         track->mState = TrackBase::STOPPING_1;
     }