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

Commit 26cd24b9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix libgui cts crash bug" am: b6dcc4c2 am: 9a8ab9a0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2057372



Change-Id: I880556723f614f3f0f778f73c3d030b829f0ebd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bec55231 9a8ab9a0

libs/gui/BufferQueueProducer.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -615,7 +615,8 @@ status_t BufferQueueProducer::dequeueBuffer(int* outSlot, sp<android::Fence>* ou 
    BQ_LOGV("dequeueBuffer: returning slot=%d/%" PRIu64 " buf=%p flags=%#x",

    BQ_LOGV("dequeueBuffer: returning slot=%d/%" PRIu64 " buf=%p flags=%#x",

            *outSlot,

            *outSlot,

            mSlots[*outSlot].mFrameNumber,

            mSlots[*outSlot].mFrameNumber,

            mSlots[*outSlot].mGraphicBuffer->handle, returnFlags);

            mSlots[*outSlot].mGraphicBuffer != nullptr ?

            mSlots[*outSlot].mGraphicBuffer->handle : nullptr, returnFlags);





    if (outBufferAge) {

    if (outBufferAge) {

        *outBufferAge = mCore->mBufferAge;

        *outBufferAge = mCore->mBufferAge;