Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d83d67b5 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

log more info on fence sync_merge error 

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

Change-Id: I4df2abe582e14c8f816b65818f4593a6bd3c23ea
parent c666cae2

libs/ui/Fence.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -55,8 +55,10 @@ sp<Fence> Fence::merge(const String8& name, const sp<Fence>& f1, 
    ATRACE_CALL();

    ATRACE_CALL();

    int result = sync_merge(name.string(), f1->mFenceFd, f2->mFenceFd);

    int result = sync_merge(name.string(), f1->mFenceFd, f2->mFenceFd);

    if (result == -1) {

    if (result == -1) {

        ALOGE("merge: sync_merge returned an error: %s (%d)", strerror(-errno),

        status_t err = -errno;

                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 NO_FENCE;

    }

    }

    return sp<Fence>(new Fence(result));

    return sp<Fence>(new Fence(result));