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

Commit f0c17b08 authored by Dan Stoza's avatar Dan Stoza Committed by Gerrit Code Review
Browse files

Merge "Avoid closing invalid FD in Surface and GraphicBufferMapper"

parents 8de71a24 dcfe91e1

libs/ui/GraphicBufferMapper.cpp

+8 −4
Original line number Diff line number Diff line
@@ -131,8 +131,10 @@ status_t GraphicBufferMapper::lockAsync(buffer_handle_t handle, 
                bounds.left, bounds.top, bounds.width(), bounds.height(),

                vaddr, fenceFd);

    } else {

        if (fenceFd >= 0) {

            sync_wait(fenceFd, -1);

            close(fenceFd);

        }

        err = mAllocMod->lock(mAllocMod, handle, static_cast<int>(usage),

                bounds.left, bounds.top, bounds.width(), bounds.height(),

                vaddr);
@@ -154,8 +156,10 @@ status_t GraphicBufferMapper::lockAsyncYCbCr(buffer_handle_t handle, 
                static_cast<int>(usage), bounds.left, bounds.top,

                bounds.width(), bounds.height(), ycbcr, fenceFd);

    } else if (mAllocMod->lock_ycbcr != NULL) {

        if (fenceFd >= 0) {

            sync_wait(fenceFd, -1);

            close(fenceFd);

        }

        err = mAllocMod->lock_ycbcr(mAllocMod, handle, static_cast<int>(usage),

                bounds.left, bounds.top, bounds.width(), bounds.height(),

                ycbcr);