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

Commit 1ffd42f0 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 am: 26cd24b9... 

Merge "Fix libgui cts crash bug" am: b6dcc4c2 am: 9a8ab9a0 am: 26cd24b9 am: 0caeeb28 am: 12159781 am: b6b95233

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



Change-Id: I979e80241cdb1845f31df0a7b00e0bc9cecaaad8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b2aa50b4 b6b95233

libs/gui/BufferQueueProducer.cpp

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

            *outSlot,

            mSlots[*outSlot].mFrameNumber,

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

            mSlots[*outSlot].mGraphicBuffer != nullptr ?

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



    if (outBufferAge) {

        *outBufferAge = mCore->mBufferAge;