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

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

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

am: 97f13565

* commit '97f13565':
  Fixing safteynet logging bug from ag/862848  - DO NOT MERGE
parents c802d209 97f13565

media/libstagefright/omx/OMX.cpp

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




status_t OMX::storeMetaDataInBuffers(

status_t OMX::storeMetaDataInBuffers(

        node_id node, OMX_U32 port_index, OMX_BOOL enable, MetadataBufferType *type) {

        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(

status_t OMX::prepareForAdaptivePlayback(