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

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

Merge "Revert "[sf] Trigger input updates in post composition"" into udc-dev... 

Merge "Revert "[sf] Trigger input updates in post composition"" into udc-dev am: f549de43 am: 4f736fa2

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



Change-Id: I0e8de145e8ac8ec16a689c9a990d13e0ce40e005
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f02ac824 4f736fa2

services/surfaceflinger/SurfaceFlinger.cpp

+6 −5
Original line number Diff line number Diff line
@@ -2519,6 +2519,8 @@ bool SurfaceFlinger::commit(TimePoint frameTime, VsyncId vsyncId, TimePoint expe 
    }



    updateCursorAsync();

    updateInputFlinger();



    if (mLayerTracingEnabled && !mLayerTracing.flagIsSet(LayerTracing::TRACE_COMPOSITION)) {

        // This will block and tracing should only be enabled for debugging.

        addToLayerTracing(mVisibleRegionsDirty, frameTime.ns(), vsyncId.value);
@@ -2859,11 +2861,6 @@ void SurfaceFlinger::postComposition(nsecs_t callTime) { 
        layer->releasePendingBuffer(presentTime.ns());

    }



    mTransactionCallbackInvoker.addPresentFence(std::move(presentFence));

    mTransactionCallbackInvoker.sendCallbacks(false /* onCommitOnly */);

    mTransactionCallbackInvoker.clearCompletedTransactions();

    updateInputFlinger();



    std::vector<std::pair<std::shared_ptr<compositionengine::Display>, sp<HdrLayerInfoReporter>>>

            hdrInfoListeners;

    bool haveNewListeners = false;
@@ -2923,6 +2920,10 @@ void SurfaceFlinger::postComposition(nsecs_t callTime) { 


    mHdrLayerInfoChanged = false;



    mTransactionCallbackInvoker.addPresentFence(std::move(presentFence));

    mTransactionCallbackInvoker.sendCallbacks(false /* onCommitOnly */);

    mTransactionCallbackInvoker.clearCompletedTransactions();



    mTimeStats->incrementTotalFrames();

    mTimeStats->setPresentFenceGlobal(presentFenceTime);