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

Commit 2f5473cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BufferQueueProducer: Slot may have null buffer [2/2]." into rvc-dev am:... 

Merge "BufferQueueProducer: Slot may have null buffer [2/2]." into rvc-dev am: d3a385b3 am: 93c8a6f2

Change-Id: I10a7a701af561185528bf47a58789f38d24e1830
parents 578f4d73 93c8a6f2

libs/gui/BufferQueueProducer.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -1121,8 +1121,9 @@ status_t BufferQueueProducer::cancelBuffer(int slot, const sp<Fence>& fence) { 
        mCore->mFreeBuffers.push_back(slot);

        mCore->mFreeBuffers.push_back(slot);

    }

    }





    if (mCore->mConsumerListener != nullptr) {

    auto gb = mSlots[slot].mGraphicBuffer;

        mCore->mConsumerListener->onFrameCancelled(mSlots[slot].mGraphicBuffer->getId());

    if (mCore->mConsumerListener != nullptr && gb != nullptr) {

        mCore->mConsumerListener->onFrameCancelled(gb->getId());

    }

    }

    mSlots[slot].mFence = fence;

    mSlots[slot].mFence = fence;

    mCore->mDequeueCondition.notify_all();

    mCore->mDequeueCondition.notify_all();