summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Matthew Bouyack <mbouyack@google.com> 2016-10-10 18:11:30 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-10 18:11:30 +0000
commitc7d352eb17bc507d9e28ec878895bd888166e514 (patch)
tree7a22b31d5f452c19367a82a130dfe91c8b9437ad /libs/gui/ConsumerBase.cpp
parentc1b0c52f4fee28a9d109d28b037faac2798d8f6b (diff)
parentfd4c8c38051f9dad028e4e43e0eb39ba412b2c0a (diff)
Use snprintf for SurfaceFlinger fence name
am: fd4c8c3805 Change-Id: I16d3eb7cde318f2078be36acea22b9bc84975b63
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
-rw-r--r--libs/gui/ConsumerBase.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/gui/ConsumerBase.cpp b/libs/gui/ConsumerBase.cpp
index 805a10d1b6..5546d5416c 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