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

Commit 1485624f authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge \\"HWC2: Backpressure on transactions as well\\" into nyc-mr1-dev am: e365c994 

am: 895b177c

Change-Id: Id4c5ec2af8cf5dffee50f91ce302e8a559e8c39c
parents e8be6625 895b177c

services/surfaceflinger/SurfaceFlinger.cpp

+9 −8
Original line number Original line Diff line number Diff line
@@ -913,6 +913,15 @@ void SurfaceFlinger::onMessageReceived(int32_t what) { 
    ATRACE_CALL();

    ATRACE_CALL();

    switch (what) {

    switch (what) {

        case MessageQueue::INVALIDATE: {

        case MessageQueue::INVALIDATE: {

            bool frameMissed = !mHadClientComposition &&

                    mPreviousPresentFence != Fence::NO_FENCE &&

                    mPreviousPresentFence->getSignalTime() == INT64_MAX;

            ATRACE_INT("FrameMissed", static_cast<int>(frameMissed));

            if (frameMissed) {

                signalLayerUpdate();

                break;

            }



            bool refreshNeeded = handleMessageTransaction();

            bool refreshNeeded = handleMessageTransaction();

            refreshNeeded |= handleMessageInvalidate();

            refreshNeeded |= handleMessageInvalidate();

            refreshNeeded |= mRepaintEverything;

            refreshNeeded |= mRepaintEverything;
@@ -942,14 +951,6 @@ bool SurfaceFlinger::handleMessageTransaction() { 




bool SurfaceFlinger::handleMessageInvalidate() {

bool SurfaceFlinger::handleMessageInvalidate() {

    ATRACE_CALL();

    ATRACE_CALL();

    bool frameMissed = !mHadClientComposition &&

            mPreviousPresentFence != Fence::NO_FENCE &&

            mPreviousPresentFence->getSignalTime() == INT64_MAX;

    ATRACE_INT("FrameMissed", static_cast<int>(frameMissed));

    if (frameMissed) {

        signalLayerUpdate();

        return false;

    }

    return handlePageFlip();

    return handlePageFlip();

}

}