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

Commit ff5c4aa6 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev

parents 33baee5d 7aff4a5d

libs/gui/ConsumerBase.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -199,7 +199,7 @@ status_t ConsumerBase::addReleaseFence(int slot, const sp<Fence>& fence) { 
        mSlots[slot].mFence = fence;

        mSlots[slot].mFence = fence;

    } else {

    } else {

        sp<Fence> mergedFence = Fence::merge(

        sp<Fence> mergedFence = Fence::merge(

                String8("ConsumerBase merged release"),

                String8::format("%.28s:%d", mName.string(), slot),

                mSlots[slot].mFence, fence);

                mSlots[slot].mFence, fence);

        if (!mergedFence.get()) {

        if (!mergedFence.get()) {

            CB_LOGE("failed to merge release fences");

            CB_LOGE("failed to merge release fences");