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

Commit df27c909 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: d3a385b3

Change-Id: Iaad22ecf622972707ad117d7be9f554532332713
parents bd8923d8 d3a385b3
Loading
Loading
Loading
Loading
+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();