ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mathias Agopian 2012-07-30 15:21:59 -07:00 committed by Android (Google) Code Review
commit e21facef01
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ui/Fence.cpp
View File

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