commit 571c285ca6d81f28c4423cddf5f334e5ef9711d1
author Max Spector <mspector@google.com> Tue Feb 23 02:39:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 02:39:13 2016 +0000
tree f111d9609981c414dd46208f0a0da8a72ae5196b
parent 81b6cc61f0bef255f725ec9e56659d1caba227c2
parent 89896480e0d69d5f564b208da1d4845ef4cbb730

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

* commit '89896480e0d69d5f564b208da1d4845ef4cbb730':
  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(