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

Commit 2cee285a authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

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

* commit 'ff5c4aa6':
  ConsumerBase: make fence names meaningful
parents 1dde9c32 ff5c4aa6

libs/gui/ConsumerBase.cpp

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

    } else {

        sp<Fence> mergedFence = Fence::merge(

                String8("ConsumerBase merged release"),

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

                mSlots[slot].mFence, fence);

        if (!mergedFence.get()) {

            CB_LOGE("failed to merge release fences");