commit ff6f2737dda8acca7fa3baab2dfee12d09b085f9
author Andy Hung <hunga@google.com> Tue Oct 11 20:32:43 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 11 20:32:43 2022 +0000
tree 493e38b27abac0ac7275096da70707aeffab2207
parent 0d8e553404b63abca17263074e06df78e14c594d
parent bee2ce45dae90ab13784ebc43cddc61b9b4b1100

Merge "Resume HW after forced pause during flush" am: 15bd303c75 am: ea786fd733 am: bee2ce45da

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

Change-Id: I51ec4be285c0aa2e66efb18b3c3e975c423c50a0
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 308466c..87eb1f5 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6470,6 +6470,7 @@
             (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) {
         status_t result = mOutput->stream->pause();
         ALOGE_IF(result != OK, "Error when pausing output stream: %d", result);
+        doHwResume = !doHwPause;  // resume if pause is due to flush.
     }
     if (mFlushPending) {
         flushHw_l();
@@ -7040,6 +7041,7 @@
     if (!mStandby && (doHwPause || (mFlushPending && !mHwPaused && (count != 0)))) {
         status_t result = mOutput->stream->pause();
         ALOGE_IF(result != OK, "Error when pausing output stream: %d", result);
+        doHwResume = !doHwPause;  // resume if pause is due to flush.
     }
     if (mFlushPending) {
         flushHw_l();