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

Commit d3bbcaff authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 21938749 to jb-mr1-dev 

Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
parents 0adc8f26 21938749

libs/gui/SurfaceTextureClient.cpp

+10 −6
Original line number Diff line number Diff line
@@ -815,6 +815,9 @@ status_t SurfaceTextureClient::lock( 
        ALOGW_IF(res, "failed locking buffer (handle = %p)",

                backBuffer->handle);



        if (res != 0) {

            err = INVALID_OPERATION;

        } else {

            mLockedBuffer = backBuffer;

            outBuffer->width  = backBuffer->width;

            outBuffer->height = backBuffer->height;
@@ -822,6 +825,7 @@ status_t SurfaceTextureClient::lock( 
            outBuffer->format = backBuffer->format;

            outBuffer->bits   = vaddr;

        }

    }

    return err;

}