commit 2cee285a97900cccd0992a274228ca806ba70884
author Jamie Gennis <jgennis@google.com> Mon Sep 24 13:38:46 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 24 13:38:46 2012 -0700
tree 6ede36dbac2acee683e43990089cb6bc535c93b0
parent 1dde9c32f2ee61fc4043bebaae14a906ed4d26f7
parent ff5c4aa676d157f4911ef06e328e687725e8b9f9

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

* commit 'ff5c4aa676d157f4911ef06e328e687725e8b9f9':
  ConsumerBase: make fence names meaningful

libs/gui/ConsumerBase.cpp

diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index fd2d1cc..f5d6ff0 100644
--- a/libs/gui/ConsumerBase.cpp
+++ b/libs/gui/ConsumerBase.cpp
@@ -199,7 +199,7 @@
         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");