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

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

Browse Source 
Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
This commit is contained in:
Jean-Baptiste Queru 2012-08-20 10:22:33 -07:00
commit d3bbcaff6f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/gui/SurfaceTextureClient.cpp
View File

@ -815,12 +815,16 @@ status_t SurfaceTextureClient::lock(
ALOGW_IF(res, "failed locking buffer (handle = %p)", ALOGW_IF(res, "failed locking buffer (handle = %p)",
backBuffer->handle); backBuffer->handle);
mLockedBuffer = backBuffer; if (res != 0) {
outBuffer->width = backBuffer->width; err = INVALID_OPERATION;
outBuffer->height = backBuffer->height; } else {
outBuffer->stride = backBuffer->stride; mLockedBuffer = backBuffer;
outBuffer->format = backBuffer->format; outBuffer->width = backBuffer->width;
outBuffer->bits = vaddr; outBuffer->height = backBuffer->height;
outBuffer->stride = backBuffer->stride;
outBuffer->format = backBuffer->format;
outBuffer->bits = vaddr;
}
} }
return err; return err;
} }