commit 15bd303c75b252f46f2b5b9ed30c8370df02b1f7
author Andy Hung <hunga@google.com> Tue Oct 11 18:26:16 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 11 18:26:16 2022 +0000
tree 30e2d80071d2868601979bbc3ea58de2af733ee9
parent d08e4950f1d8d3180d729eec9b4f324480a3c131
parent cd1e162d13af380864794e5a92ac2dc6d3074bbb

Merge "Resume HW after forced pause during flush"

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index dead6cc..87a6bd1 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -6419,6 +6419,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();
@@ -6989,6 +6990,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();