diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-02-13 23:22:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 23:22:04 +0000 |
| commit | b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9 (patch) | |
| tree | 640c13270504ecc91c21bdc62a0b8397a4a5426f /libs/gui/SurfaceTextureClient.cpp | |
| parent | c8a1e10fd2465509685d382c79d7c059db8491ac (diff) | |
| parent | c52e16cbf9798b95188c82465dfd84b914ff5199 (diff) | |
| download | frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.zip frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.tar.gz frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.tar.bz2 | |
Merge changes I50831d4e,I5360aebe
* changes:
flatland: remove an unneeded #include
libgui: disallow NULL Fence pointers
Diffstat (limited to 'libs/gui/SurfaceTextureClient.cpp')
| -rw-r--r-- | libs/gui/SurfaceTextureClient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/gui/SurfaceTextureClient.cpp b/libs/gui/SurfaceTextureClient.cpp index c015b81..5ed2e38 100644 --- a/libs/gui/SurfaceTextureClient.cpp +++ b/libs/gui/SurfaceTextureClient.cpp @@ -216,7 +216,7 @@ int SurfaceTextureClient::dequeueBuffer(android_native_buffer_t** buffer, } } - if (fence.get()) { + if (fence->isValid()) { *fenceFd = fence->dup(); if (*fenceFd == -1) { ALOGE("dequeueBuffer: error duping fence: %d", errno); @@ -241,7 +241,7 @@ int SurfaceTextureClient::cancelBuffer(android_native_buffer_t* buffer, if (i < 0) { return i; } - sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : NULL); + sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE); mSurfaceTexture->cancelBuffer(i, fence); return OK; } @@ -287,7 +287,7 @@ int SurfaceTextureClient::queueBuffer(android_native_buffer_t* buffer, int fence Rect crop; mCrop.intersect(Rect(buffer->width, buffer->height), &crop); - sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : NULL); + sp<Fence> fence(fenceFd >= 0 ? new Fence(fenceFd) : Fence::NO_FENCE); IGraphicBufferProducer::QueueBufferOutput output; IGraphicBufferProducer::QueueBufferInput input(timestamp, crop, mScalingMode, mTransform, fence); |