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

Commit 902f3a52 authored by Tobin Ehlis's avatar Tobin Ehlis Committed by Android (Google) Code Review
Browse files

Merge "BnGraphicBufferProducer: Add null fence checks"

parents f94f4244 209e5fb1

libs/gui/IGraphicBufferProducer.cpp

+8 −0
Original line number Diff line number Diff line
@@ -781,6 +781,10 @@ status_t BnGraphicBufferProducer::onTransact( 
            int result = dequeueBuffer(&buf, &fence, width, height, format, usage, &bufferAge,

                                       getTimestamps ? &frameTimestamps : nullptr);



            if (fence == nullptr) {

                ALOGE("dequeueBuffer returned a NULL fence, setting to Fence::NO_FENCE");

                fence = Fence::NO_FENCE;

            }

            reply->writeInt32(buf);

            reply->write(*fence);

            reply->writeUint64(bufferAge);
@@ -963,6 +967,10 @@ status_t BnGraphicBufferProducer::onTransact( 
                ALOGE("getLastQueuedBuffer failed to write buffer: %d", result);

                return result;

            }

            if (fence == nullptr) {

                ALOGE("getLastQueuedBuffer returned a NULL fence, setting to Fence::NO_FENCE");

                fence = Fence::NO_FENCE;

            }

            result = reply->write(*fence);

            if (result != NO_ERROR) {

                ALOGE("getLastQueuedBuffer failed to write fence: %d", result);