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

Commit a5e031ef authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 7944517 from 3316c977 to sc-v2-release 

Change-Id: I02b584cebf502e052eac0ea1c9cfe1f6826633dc
parents ebc9e59e 3316c977

libs/gui/BLASTBufferQueue.cpp

+8 −2
Original line number Diff line number Diff line
@@ -529,7 +529,6 @@ void BLASTBufferQueue::acquireNextBufferLocked( 


    // Ensure BLASTBufferQueue stays alive until we receive the transaction complete callback.

    incStrong((void*)transactionCallbackThunk);

    incStrong((void*)transactionCommittedCallbackThunk);



    const bool sizeHasChanged = mRequestedSize != mSize;

    mSize = mRequestedSize;
@@ -550,7 +549,7 @@ void BLASTBufferQueue::acquireNextBufferLocked( 
    t->setAcquireFence(mSurfaceControl,

                       bufferItem.mFence ? new Fence(bufferItem.mFence->dup()) : Fence::NO_FENCE);

    t->addTransactionCompletedCallback(transactionCallbackThunk, static_cast<void*>(this));

    t->addTransactionCommittedCallback(transactionCommittedCallbackThunk, static_cast<void*>(this));



    mSurfaceControlsWithPendingCallback.push(mSurfaceControl);



    if (updateDestinationFrame) {
@@ -673,6 +672,13 @@ void BLASTBufferQueue::onFrameAvailable(const BufferItem& item) { 


    if (nextTransactionSet) {

        acquireNextBufferLocked(std::move(mNextTransaction));



        // Only need a commit callback when syncing to ensure the buffer that's synced has been sent

        // to SF

        incStrong((void*)transactionCommittedCallbackThunk);

        mNextTransaction->addTransactionCommittedCallback(transactionCommittedCallbackThunk,

                                                          static_cast<void*>(this));



        mNextTransaction = nullptr;

        mWaitForTransactionCallback = true;

    } else if (!mWaitForTransactionCallback) {