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

Commit 9ef9d51e authored by Jamie Gennis's avatar Jamie Gennis Committed by The Android Automerger
Browse files

SurfaceFlinger: fix a couple NULL fence checks 

This change replaces checks for a NULL fence pointer with calls to
Fence::isValid.  There should no longer be NULL fences.

Change-Id: If17c9c132fcb1801531bf7588f8ba53476c57dad
parent f5c7cb31

services/surfaceflinger/Layer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ void Layer::onPostComposition() { 
        mFrameTracker.setDesiredPresentTime(desiredPresentTime);



        sp<Fence> frameReadyFence = mSurfaceFlingerConsumer->getCurrentFence();

        if (frameReadyFence != NULL) {

        if (frameReadyFence->isValid()) {

            mFrameTracker.setFrameReadyFence(frameReadyFence);

        } else {

            // There was no fence for this frame, so assume that it was ready
@@ -536,7 +536,7 @@ void Layer::onPostComposition() { 


        const HWComposer& hwc = mFlinger->getHwComposer();

        sp<Fence> presentFence = hwc.getDisplayFence(HWC_DISPLAY_PRIMARY);

        if (presentFence != NULL) {

        if (presentFence->isValid()) {

            mFrameTracker.setActualPresentFence(presentFence);

        } else {

            // The HWC doesn't support present fences, so use the refresh