commit d2227cec24dc35dfc1640dfd5351adca646fa704
author android-build-team Robot <android-build-team-robot@google.com> Fri Jun 05 16:17:06 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Jun 05 16:30:35 2020 +0000
tree cf1abb7037cf75c7247e063523620b8ddd2f718b
parent a592a748da5bbb08a5757c0bebf50101503c4c50
parent 8565bf27cc8ad02fd332287f34287b302948dede

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

Change-Id: I6b894add1ecace530626f1c9536dcb23accf6cd8

apex/manifest.json

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

apex/manifest_codec.json

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

apex/testing/Android.bp

diff --git a/apex/testing/Android.bp b/apex/testing/Android.bp
index 376d3e4..a04ab3f 100644
--- a/apex/testing/Android.bp
+++ b/apex/testing/Android.bp
@@ -17,6 +17,7 @@
     manifest: "test_manifest.json",
     file_contexts: ":com.android.media-file_contexts",
     defaults: ["com.android.media-defaults"],
+    prebuilts: ["sdkinfo_45"],
     installable: false,
 }
 

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 0eaa503..e6bb2e1 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1159,7 +1159,7 @@
         readBuffer(MEDIA_TRACK_TYPE_VIDEO, seekTimeUs, mode, &actualTimeUs);
 
         if (mode != MediaPlayerSeekMode::SEEK_CLOSEST) {
-            seekTimeUs = actualTimeUs;
+            seekTimeUs = std::max<int64_t>(0, actualTimeUs);
         }
         mVideoLastDequeueTimeUs = actualTimeUs;
     }