commit 743f640339310f980cc6480514fb67bcd26cc717
author Andy Hung <hunga@google.com> Wed Jun 03 13:17:04 2020 -0700
committer Andy Hung <hunga@google.com> Wed Jun 03 16:58:35 2020 -0700
tree 75f7c4cb4c3682850fddb8ff4080acd2307a4931
parent 4e48c2477d084919f13ee191a6c36713d83063f3

AudioFlinger: Fix read timestamp if HAL returns error

Test: android.media.cts.AudioRecordTest#testTimestamp
Bug: 158112444
Change-Id: Ibb35c6247ab94e63d586eddd1c95b7fc186e7822

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 849c050..024168b 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -7366,8 +7366,10 @@
 
         // Update server timestamp with server stats
         // systemTime() is optional if the hardware supports timestamps.
-        mTimestamp.mPosition[ExtendedTimestamp::LOCATION_SERVER] += framesRead;
-        mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = lastIoEndNs;
+        if (framesRead >= 0) {
+            mTimestamp.mPosition[ExtendedTimestamp::LOCATION_SERVER] += framesRead;
+            mTimestamp.mTimeNs[ExtendedTimestamp::LOCATION_SERVER] = lastIoEndNs;
+        }
 
         // Update server timestamp with kernel stats
         if (mPipeSource.get() == nullptr /* don't obtain for FastCapture, could block */) {