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

Commit 7bce6ac5 authored by Ady Abraham's avatar Ady Abraham Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I719dba10aef06f0fc529417428de28e7ae27361d
parents 65f4fdee b5ecae7b

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;

}