commit ac759d4964ef03df26fbc99660b4daa4f96537fd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Apr 11 07:24:04 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 11 07:24:04 2024 +0000
tree 38d8c1eaa2c286b111e1db99efef915689e0e637
parent 923b3a0aa8385794324677cb0ca06bc1a4b3e314
parent e93e6cf26be483ada83d6d29dcc62b625257cbbd

Merge "avoid resetting mExpectRetrograde when deltaHalPosition == 0" into 24D1-dev

services/audioflinger/datapath/AudioStreamOut.cpp

diff --git a/services/audioflinger/datapath/AudioStreamOut.cpp b/services/audioflinger/datapath/AudioStreamOut.cpp
index 9851f3a..aad538f 100644
--- a/services/audioflinger/datapath/AudioStreamOut.cpp
+++ b/services/audioflinger/datapath/AudioStreamOut.cpp
@@ -64,7 +64,7 @@
     int32_t deltaHalPosition; // initialization not needed, overwitten by __builtin_sub_overflow()
     (void) __builtin_sub_overflow(halPosition, truncatedPosition, &deltaHalPosition);
 
-    if (deltaHalPosition > 0) {
+    if (deltaHalPosition >= 0) {
         mRenderPosition += deltaHalPosition;
     } else if (mExpectRetrograde) {
         mExpectRetrograde = false;