commit a592a748da5bbb08a5757c0bebf50101503c4c50
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 05 07:29:15 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 05 07:31:04 2020 +0000
tree ef2b33b63977d2ce74b0f2e43838797ee8172f7b
parent 4323358d62da9c9dbc9cfd9d5d2e1b9da822c26e
parent 4094fc6d98fb4c33ced93c3a4df744ec27baca12

Make change and version bump to r_aml_300800400 for mainline module file: apex/manifest_codec.json

Change-Id: I02fb1fdba1f05dc811b9c734f8ed3070eb384775

apex/manifest.json

diff --git a/apex/manifest.json b/apex/manifest.json
index 1b17e16..33f0cd2 100644
--- a/apex/manifest.json
+++ b/apex/manifest.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media",
-  "version": 300800200
+  "version": 300800400
 }

apex/manifest_codec.json

diff --git a/apex/manifest_codec.json b/apex/manifest_codec.json
index f3be6e3..b6a40fa 100644
--- a/apex/manifest_codec.json
+++ b/apex/manifest_codec.json
@@ -1,4 +1,4 @@
 {
   "name": "com.android.media.swcodec",
-  "version": 300800200
+  "version": 300800400
 }

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 */) {