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

Commit f9c1b98e authored by Vishnu Nair's avatar Vishnu Nair Committed by Android (Google) Code Review
Browse files

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

parents f157a03a a7e4eaf3

services/surfaceflinger/SurfaceFlinger.cpp

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

    }





    updateCursorAsync();

    updateCursorAsync();

    updateInputFlinger();



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

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

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

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

        addToLayerTracing(mVisibleRegionsDirty, frameTime.ns(), vsyncId.value);

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

        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>>>

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

            hdrInfoListeners;

            hdrInfoListeners;

    bool haveNewListeners = false;

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




    mHdrLayerInfoChanged = false;

    mHdrLayerInfoChanged = false;





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

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

    mTransactionCallbackInvoker.clearCompletedTransactions();



    mTimeStats->incrementTotalFrames();

    mTimeStats->incrementTotalFrames();

    mTimeStats->setPresentFenceGlobal(presentFenceTime);

    mTimeStats->setPresentFenceGlobal(presentFenceTime);