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

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

Merge "Fixing safteynet logging bug introduced in ag/862848" into mnc-dev am: 93edd483 

am: 032fcf30

* commit '032fcf30':
  Fixing safteynet logging bug introduced in ag/862848
parents 96ddf531 032fcf30

media/libmedia/IOMX.cpp

+0 −4
Original line number Original line Diff line number Diff line
@@ -925,10 +925,6 @@ status_t BnOMX::onTransact( 
            MetadataBufferType type = kMetadataBufferTypeInvalid;

            MetadataBufferType type = kMetadataBufferTypeInvalid;

            status_t err = storeMetaDataInBuffers(node, port_index, enable, &type);

            status_t err = storeMetaDataInBuffers(node, port_index, enable, &type);





            if ((err != OK) && (type == kMetadataBufferTypeInvalid)) {

                android_errorWriteLog(0x534e4554, "26324358");

            }



            reply->writeInt32(type);

            reply->writeInt32(type);

            reply->writeInt32(err);

            reply->writeInt32(err);

media/libstagefright/omx/OMXNodeInstance.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -519,6 +519,7 @@ status_t OMXNodeInstance::storeMetaDataInBuffers( 
status_t OMXNodeInstance::storeMetaDataInBuffers_l(

status_t OMXNodeInstance::storeMetaDataInBuffers_l(

        OMX_U32 portIndex, OMX_BOOL enable, MetadataBufferType *type) {

        OMX_U32 portIndex, OMX_BOOL enable, MetadataBufferType *type) {

    if (portIndex != kPortIndexInput && portIndex != kPortIndexOutput) {

    if (portIndex != kPortIndexInput && portIndex != kPortIndexOutput) {

        android_errorWriteLog(0x534e4554, "26324358");

        return BAD_VALUE;

        return BAD_VALUE;

    }

    }