ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'ff5c4aa676d157f4911ef06e328e687725e8b9f9':
  ConsumerBase: make fence names meaningful
This commit is contained in:
Jamie Gennis 2012-09-24 13:38:46 -07:00 committed by Android Git Automerger
commit 2cee285a97
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/gui/ConsumerBase.cpp
View File

@ -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");