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

Commit db4a3e57 authored by Pawin Vongmasa's avatar Pawin Vongmasa Committed by android-build-merger
Browse files

Merge "Check the return value from allocateSecureBuffer" into oc-dev am: 0375da69 

am: d6da847e

Change-Id: I485d69da0a2d1d1067a801ae0612396287160dfc
parents 20e8fc45 d6da847e

media/libmedia/omx/1.0/WOmxNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -350,7 +350,8 @@ Return<void> TWOmxNode::allocateSecureBuffer( 
            &buffer,

            &bufferData,

            &nativeHandle));

    _hidl_cb(status, buffer, nativeHandle->handle());

    _hidl_cb(status, buffer, nativeHandle == nullptr ?

            nullptr : nativeHandle->handle());

    return Void();

}

media/libstagefright/omx/1.0/WOmxNode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -353,7 +353,8 @@ Return<void> TWOmxNode::allocateSecureBuffer( 
            &buffer,

            &bufferData,

            &nativeHandle));

    _hidl_cb(status, buffer, nativeHandle->handle());

    _hidl_cb(status, buffer, nativeHandle == nullptr ?

            nullptr : nativeHandle->handle());

    return Void();

}