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

Commit 9f7e205a authored by Dongwon Kang's avatar Dongwon Kang Committed by android-build-merger
Browse files

Block allocateBufferWithBackup in secure native handle mode am: 528c7dd7 

am: 9b14c305

Change-Id: Iad77f455e6f20065af28e2482457f396d0aa1631
parents d1c36259 9b14c305

media/libstagefright/omx/OMXNodeInstance.cpp

+12 −0
Original line number Diff line number Diff line
@@ -1235,6 +1235,12 @@ status_t OMXNodeInstance::allocateSecureBuffer( 
        return BAD_VALUE;

    }



    if (mSecureBufferType[portIndex] == kSecureBufferTypeUnknown) {

        ALOGE("b/63522818");

        android_errorWriteLog(0x534e4554, "63522818");

        return ERROR_UNSUPPORTED;

    }



    BufferMeta *buffer_meta = new BufferMeta(size, portIndex);



    OMX_BUFFERHEADERTYPE *header;
@@ -1296,6 +1302,12 @@ status_t OMXNodeInstance::allocateBufferWithBackup( 
        return BAD_VALUE;

    }



    if (mSecureBufferType[portIndex] != kSecureBufferTypeUnknown) {

        ALOGE("b/63522818");

        android_errorWriteLog(0x534e4554, "63522818");

        return ERROR_UNSUPPORTED;

    }



    // metadata buffers are not connected cross process; only copy if not meta

    bool copy = mMetadataType[portIndex] == kMetadataBufferTypeInvalid;