commit 97f1356544f32cc8c5fc2b778b8e1aab11b13a6c
author Max Spector <mspector@google.com> Tue Feb 23 02:26:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 02:26:11 2016 +0000
tree 9c3b1845995e77bddc056010faa3507a392f10fd
parent 032fcf3034b79ea2a221d73c9f01202a4a709273
parent 49c04280f24b17e7493a357089587add5046b573

Merge "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE" into mnc-dev
am: 49c04280f2

* commit '49c04280f24b17e7493a357089587add5046b573':
  Fixing safteynet logging bug from ag/862848  - DO NOT MERGE

media/libstagefright/omx/OMX.cpp

diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index 7f357c9..2c5b8df 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -344,7 +344,13 @@
 
 status_t OMX::storeMetaDataInBuffers(
         node_id node, OMX_U32 port_index, OMX_BOOL enable, MetadataBufferType *type) {
-    return findInstance(node)->storeMetaDataInBuffers(port_index, enable, type);
+    OMXNodeInstance *instance = findInstance(node);
+
+    if (instance == NULL) {
+        android_errorWriteLog(0x534e4554, "26324358");
+    }
+
+    return instance->storeMetaDataInBuffers(port_index, enable, type);
 }
 
 status_t OMX::prepareForAdaptivePlayback(