commit 92047ec34ba7339ff1b99ede8e483cc2f64d436c
author Marco Nelissen <marcone@google.com> Fri Oct 14 14:49:24 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 14 14:49:24 2016 +0000
tree 9e8a6562070f676b8c51e38ab6f490d7cb584764
parent 4065e775e643faa71102aa644acf8f93731e0b0c
parent c3fe699d319ee040515a230dc94e7cf50c95c05a

Merge "Fix issues with metadata handling when format change happens"

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);