diff options
| author | Mathias Agopian <mathias@google.com> | 2012-07-30 15:21:59 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-30 15:22:00 -0700 |
| commit | e21facef01b2e8d2558e4561639eaf9ff135e312 (patch) | |
| tree | 3ff493063c90ece56f6faeb822fa3dcf8317120c /libs | |
| parent | 747c480b0e3cf9401ff53421be6a82b23fdc04c2 (diff) | |
| parent | d83d67b5d5e98b7f0bdf54b68f6ea28fa4905a33 (diff) | |
| download | frameworks_native-e21facef01b2e8d2558e4561639eaf9ff135e312.zip frameworks_native-e21facef01b2e8d2558e4561639eaf9ff135e312.tar.gz frameworks_native-e21facef01b2e8d2558e4561639eaf9ff135e312.tar.bz2 | |
Merge "log more info on fence sync_merge error" into jb-mr1-dev
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/Fence.cpp | 6 |
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)); |