commit 957c386860aa8af0505c67b2dcbd3fe371abb7eb
author Max Spector <mspector@google.com> Tue Feb 23 21:30:42 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 23 21:30:42 2016 +0000
tree a6b04f9e43a64ab62391bacf5b12ecd220c725ee
parent 313d9f14e4140bacc52b27972abc0c65d4e91fdc
parent 22cc29a7fd4f8ae4cf2fdc82febaaedb523cb915

Merge "Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"" into mnc-dev

media/libstagefright/omx/OMX.cpp

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