commit d41a64c7ad26fb6d26e2531e95d018e4e0174574
author Marco Nelissen <marcone@google.com> Fri Oct 14 14:53:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Oct 14 14:53:48 2016 +0000
tree 9e8a6562070f676b8c51e38ab6f490d7cb584764
parent 8bb45af7e914b655311c7ce7e71701c028885e77
parent 92047ec34ba7339ff1b99ede8e483cc2f64d436c

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

Change-Id: Ib9ed5ce0c7c12f99be25aaabef3e53038aa03b7d

media/libmediaplayerservice/nuplayer/StreamingSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/StreamingSource.cpp b/media/libmediaplayerservice/nuplayer/StreamingSource.cpp
index c4147e1..47ec3e9 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->setInt32("err", err);