commit e21facef01b2e8d2558e4561639eaf9ff135e312
author Mathias Agopian <mathias@google.com> Mon Jul 30 15:21:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 30 15:22:00 2012 -0700
tree 3ff493063c90ece56f6faeb822fa3dcf8317120c
parent 747c480b0e3cf9401ff53421be6a82b23fdc04c2
parent d83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33

Merge "log more info on fence sync_merge error" into jb-mr1-dev

libs/ui/Fence.cpp

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