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

Commit 48856d97 authored by Matthew Bouyack's avatar Matthew Bouyack Committed by android-build-merger
Browse files

In SurfaceFlinger, test fence before merging am: 377c2033 

am: 29cacbe8

Change-Id: I2daf0fe8d3e6c25cd41e46940137842179da1e6e
parents e99b51d1 29cacbe8

libs/gui/ConsumerBase.cpp

+12 −0
Original line number Diff line number Diff line
@@ -314,6 +314,18 @@ status_t ConsumerBase::addReleaseFenceLocked(int slot, 


    if (!mSlots[slot].mFence.get()) {

        mSlots[slot].mFence = fence;

        return OK;

    }



    auto signaled = mSlots[slot].mFence->hasSignaled();



    if (!signaled) {

        CB_LOGE("fence has invalid state");

        return BAD_VALUE;

    }



    if (*signaled) {

        mSlots[slot].mFence = fence;

    } else {

        char fenceName[32] = {};

        snprintf(fenceName, 32, "%.28s:%d", mName.string(), slot);