From d83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Mon, 30 Jul 2012 15:10:35 -0700
Subject: [PATCH] log more info on fence sync_merge error

also fix a typo where the wrong value was passed to sterror.

Change-Id: I4df2abe582e14c8f816b65818f4593a6bd3c23ea
---
 libs/ui/Fence.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/ui/Fence.cpp b/libs/ui/Fence.cpp
index 932bcdd4e..cec587613 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));