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

Commit 8254d983 authored by Vishnu Nair's avatar Vishnu Nair Committed by Automerger Merge Worker
Browse files

Merge "Fix acquire and framenumber mismatch in transaction complete callback"... 

Merge "Fix acquire and framenumber mismatch in transaction complete callback" into sc-dev am: 3c18744b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If94b0cd3ab5ea8e05813356284f307f77917a26c
parents 385aa11a 3c18744b

services/surfaceflinger/BufferStateLayer.cpp

+4 −2
Original line number Diff line number Diff line
@@ -461,6 +461,7 @@ bool BufferStateLayer::setTransactionCompletedListeners( 
        if (willPresent) {

            // If this transaction set an acquire fence on this layer, set its acquire time

            handle->acquireTime = mCallbackHandleAcquireTime;

            handle->frameNumber = mCurrentState.frameNumber;



            // Notify the transaction completed thread that there is a pending latched callback

            // handle
@@ -632,8 +633,9 @@ status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nse 
    }



    for (auto& handle : mDrawingState.callbackHandles) {

        if (handle->frameNumber == mDrawingState.frameNumber) {

            handle->latchTime = latchTime;

        handle->frameNumber = mDrawingState.frameNumber;

        }

    }



    const int32_t layerId = getSequence();