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

2012-09-24 13:36:55 -07:00 · 2012-09-24 13:36:55 -07:00 · ff5c4aa676
parent 33baee5d88 7aff4a5de4
commit ff5c4aa676
1 changed files with 1 additions and 1 deletions
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@ -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");