Loading libs/gui/ConsumerBase.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -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"); Loading Loading
libs/gui/ConsumerBase.cpp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -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"); Loading