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

Commit 5b11d90d authored by Valerie Hau's avatar Valerie Hau Committed by Automerger Merge Worker
Browse files

Merge "Send transaction callbacks earlier" into rvc-dev am: 8e84c4bb 

Change-Id: I226d54a0ac20b68fb85acbfeb3235bc69f677a5e
parents d3de344c 8e84c4bb

services/surfaceflinger/SurfaceFlinger.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2245,6 +2245,9 @@ void SurfaceFlinger::postComposition() 
        }

    });



    mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);

    mTransactionCompletedThread.sendCallbacks();



    if (displayDevice && displayDevice->isPrimary() &&

        displayDevice->getPowerMode() == HWC_POWER_MODE_NORMAL && presentFenceTime->isValid()) {

        mScheduler->addPresentFence(presentFenceTime);
@@ -2325,9 +2328,6 @@ void SurfaceFlinger::postComposition() 
        }

    }



    mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);

    mTransactionCompletedThread.sendCallbacks();



    if (mLumaSampling && mRegionSamplingThread) {

        mRegionSamplingThread->notifyNewContent();

    }