commit 599d48825f040c074027ffaf9e4b5490428adacb
author Jamie Gennis <jgennis@google.com> Wed Aug 08 16:13:20 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 08 16:13:21 2012 -0700
tree 202c5cf501b557ce27c4841faac3d6760c7b0aa4
parent 85aea748861b5665e68b786b55f1c798f56fc0da
parent 3d1d09c0c116c42f7d083f87628b5f8377b1f275

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

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index a2aca8f..6666081 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -327,9 +327,9 @@
 }
 
 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 {