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

Commit d6da847e 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

Change-Id: If510f661463d23de18dc127287db7593287304a4
parents 31021342 0375da69

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();

}