commit 56f8f1d5e8cc2538644f4523e8b5a188bc7658eb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Aug 15 20:15:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 15 20:15:05 2023 +0000
tree 8d260ef54bfdef625bf36d7a493aaf7d0ce67839
parent 89f764e5819e7e6e9a453b631623d480245d1764
parent 205d6b6be4bdfce3f0592a5a0bd0c4d046f698e0

Merge "Snap for 10660016 from 82bbcdfcfd281b5b8ae2657d06bd34068d8301a8 to android11-tests-release" into android11-tests-release

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 2af27d8..21661b0 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -5941,15 +5941,17 @@
                     // indicate to client process that the track was disabled because of underrun;
                     // it will then automatically call start() when data is available
                     track->disable();
-                } else if (last) {
+                    // only do hw pause when track is going to be removed due to BUFFER TIMEOUT.
+                    // unlike mixerthread, HAL can be paused for direct output
                     ALOGW("pause because of UNDERRUN, framesReady = %zu,"
                             "minFrames = %u, mFormat = %#x",
                             framesReady, minFrames, mFormat);
-                    mixerStatus = MIXER_TRACKS_ENABLED;
-                    if (mHwSupportsPause && !mHwPaused && !mStandby) {
+                    if (last && mHwSupportsPause && !mHwPaused && !mStandby) {
                         doHwPause = true;
                         mHwPaused = true;
                     }
+                } else if (last) {
+                    mixerStatus = MIXER_TRACKS_ENABLED;
                 }
             }
         }