commit a2e99a3de2d4ccd7f3e31d79d29eccd4ee0f8f4b
author Marco Nelissen <marcone@google.com> Fri Oct 14 15:00:49 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 14 15:00:49 2016 +0000
tree f00e90aa8bed17d60362268e96f2e43f7dee3c8f
parent dd5ff6664ed7f332bfc6c48e73c0a735169975d1
parent 2a02f18cf1bef68626a4849fa38c02553f3c747a

Merge "Fix issues with metadata handling when format change happens" am: 92047ec34b am: d41a64c7ad
am: 2a02f18cf1

Change-Id: Ia945c856b0b805111ebcb5a93908934ddaa78db1

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
index a7c5cf4..7f9f913 100644
--- a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
@@ -228,6 +228,10 @@
     }
 
     sp<MetaData> meta = source->getFormat();
+    if (meta == NULL) {
+        format->setInt32("err", -EWOULDBLOCK);
+        return format;
+    }
     status_t err = convertMetaDataToMessage(meta, &format);
     if (err != OK) { // format may have been cleared on error
         format = new AMessage;