summaryrefslogtreecommitdiffstats
path: root/libs/ui
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2012-07-30 15:10:35 -0700
committerMathias Agopian <mathias@google.com>2012-07-30 15:10:35 -0700
commitd83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33 (patch)
tree6bc8597b19bf03006341a25680ff5e2c7b5a9691 /libs/ui
parentc666cae2d5995097ec49a87e375e2afdd92802b7 (diff)
downloadframeworks_native-d83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33.zip
frameworks_native-d83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33.tar.gz
frameworks_native-d83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33.tar.bz2
log more info on fence sync_merge error
also fix a typo where the wrong value was passed to sterror. Change-Id: I4df2abe582e14c8f816b65818f4593a6bd3c23ea
Diffstat (limited to 'libs/ui')
-rw-r--r--libs/ui/Fence.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index 932bcdd..cec5876 100644
--- a/libs/ui/Fence.cpp
+++ b/libs/ui/Fence.cpp
@@ -55,8 +55,10 @@ sp<Fence> Fence::merge(const String8& name, const sp<Fence>& f1,
ATRACE_CALL();
int result = sync_merge(name.string(), f1->mFenceFd, f2->mFenceFd);
if (result == -1) {
- ALOGE("merge: sync_merge returned an error: %s (%d)", strerror(-errno),
- errno);
+ status_t err = -errno;
+ ALOGE("merge: sync_merge(\"%s\", %d, %d) returned an error: %s (%d)",
+ name.string(), f1->mFenceFd, f2->mFenceFd,
+ strerror(-err), err);
return NO_FENCE;
}
return sp<Fence>(new Fence(result));