diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-09-24 13:36:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 13:36:56 -0700 |
| commit | ff5c4aa676d157f4911ef06e328e687725e8b9f9 (patch) | |
| tree | 6ede36dbac2acee683e43990089cb6bc535c93b0 | |
| parent | 33baee5d88974a3b668f9d7f0716eed815966773 (diff) | |
| parent | 7aff4a5de47bf32b0934f5744cd1df4ce666d2d2 (diff) | |
| download | frameworks_native-ff5c4aa676d157f4911ef06e328e687725e8b9f9.zip frameworks_native-ff5c4aa676d157f4911ef06e328e687725e8b9f9.tar.gz frameworks_native-ff5c4aa676d157f4911ef06e328e687725e8b9f9.tar.bz2 | |
Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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"); |