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

Commit b5ecae7b authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SF: avoid calling pendingBuffers.insert twice" into sc-dev

parents 49c01d0b c7900120

services/surfaceflinger/SurfaceFlinger.cpp

+1 −2
Original line number Diff line number Diff line
@@ -3420,7 +3420,7 @@ bool SurfaceFlinger::transactionIsReadyToBeApplied( 
        const auto vsyncId = frameTimelineInfoChanged ? s.frameTimelineInfo.vsyncId : info.vsyncId;

        if (isAutoTimestamp && layer->frameIsEarly(expectedPresentTime, vsyncId)) {

            ATRACE_NAME("frameIsEarly()");

            return false;

            ready = false;

        }



        if (!mScheduler->isVsyncValid(expectedPresentTime, layer->getOwnerUid())) {
@@ -3438,7 +3438,6 @@ bool SurfaceFlinger::transactionIsReadyToBeApplied( 
            }

            pendingBuffers.insert(s.surface);

        }

        pendingBuffers.insert(s.surface);

    }

    return ready;

}