Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f9691a1 authored by Max Spector's avatar Max Spector Committed by android-build-merger
Browse files

Merge "Revert "Fixing safteynet logging bug from ag/862848 - DO NOT MERGE""... 

Merge "Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"" into mnc-dev am: 957c3868
am: 00ff259b

* commit '00ff259b':
  Revert "Fixing safteynet logging bug from ag/862848  - DO NOT MERGE"
parents 543df24f 00ff259b

media/libstagefright/omx/OMX.cpp

+1 −7
Original line number Diff line number Diff line
@@ -344,13 +344,7 @@ status_t OMX::getGraphicBufferUsage( 


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(