Merge "nuplayer: handle error from MediaCodec in Decoder handleAnOutputBuffer" into mnc-dev am: 7fad4bb2da am: 18b22afe7a am: e42227983a am: f669386ff9 am: af6aa6e3fa

am: 773023ddbd

Change-Id: Icb6d1e4e353b2f43b9d1539621379a5dffd84e27

media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp

@@ -631,6 +631,11 @@ bool NuPlayer::Decoder::handleAnOutputBuffer(
     sp<ABuffer> buffer;
     mCodec->getOutputBuffer(index, &buffer);
 
+    if (buffer == NULL) {
+        handleError(UNKNOWN_ERROR);
+        return false;
+    }
+
     if (index >= mOutputBuffers.size()) {
         for (size_t i = mOutputBuffers.size(); i <= index; ++i) {
             mOutputBuffers.add();