diff options
| author | 2016-10-10 18:03:37 +0000 | |
|---|---|---|
| committer | 2016-10-10 18:03:37 +0000 | |
| commit | f35d95673e68285b2c25c914e51d9fba8e833a26 (patch) | |
| tree | 4fd387a29bbacdca5971077b39ab76a09c3da958 /libs/gui/ConsumerBase.cpp | |
| parent | 76456aa438db2aae059f43991ba627ea8ab10e8b (diff) | |
| parent | fd4c8c38051f9dad028e4e43e0eb39ba412b2c0a (diff) | |
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
| -rw-r--r-- | libs/gui/ConsumerBase.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp index a1bdf4a4a1..e7bc7dc73d 100644 --- a/libs/gui/ConsumerBase.cpp +++ b/libs/gui/ConsumerBase.cpp @@ -315,9 +315,10 @@ status_t ConsumerBase::addReleaseFenceLocked(int slot, if (!mSlots[slot].mFence.get()) { mSlots[slot].mFence = fence; } else { + char fenceName[32] = {}; + snprintf(fenceName, 32, "%.28s:%d", mName.string(), slot); sp<Fence> mergedFence = Fence::merge( - String8::format("%.28s:%d", mName.string(), slot), - mSlots[slot].mFence, fence); + fenceName, mSlots[slot].mFence, fence); if (!mergedFence.get()) { CB_LOGE("failed to merge release fences"); // synchronization is broken, the best we can do is hope fences |