Merge "SurfaceTexture: Fix a fence fd leak." into jb-mr1-dev

This commit is contained in:
Jamie Gennis 2012-08-08 16:13:20 -07:00 committed by Android (Google) Code Review
commit 599d48825f
1 changed files with 1 additions and 1 deletions

View File

@ -327,9 +327,9 @@ status_t SurfaceTexture::updateTexImage(BufferRejecter* rejecter) {
}
void SurfaceTexture::setReleaseFence(int fenceFd) {
sp<Fence> fence(new Fence(fenceFd));
if (fenceFd == -1 || mCurrentTexture == BufferQueue::INVALID_BUFFER_SLOT)
return;
sp<Fence> fence(new Fence(fenceFd));
if (!mEGLSlots[mCurrentTexture].mReleaseFence.get()) {
mEGLSlots[mCurrentTexture].mReleaseFence = fence;
} else {