commit 37bd30bfd59a352452aea474ece764a6a14f71a9
author Mathias Agopian <mathias@google.com> Thu Sep 20 14:09:08 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 20 14:09:08 2012 -0700
tree e74bf9732b622ed8ee594f223f39619f319c468b
parent 813601785f9ef37f892034a7722d176deea41eec
parent 9bd8dd3b13a0d690c9316ed31be7c9a13f3f439f

Merge "ANW: fix an fd leak" into jb-mr1-dev

include/system/window.h

diff --git a/include/system/window.h b/include/system/window.h
index 685e068..1e7f114 100644
--- a/include/system/window.h
+++ b/include/system/window.h
@@ -828,9 +828,8 @@
     int err = anw->dequeueBuffer(anw, anb, &fenceFd);
     if (err == 0 && fenceFd != -1) {
         err = sync_wait(fenceFd, UINT_MAX);
-        if (err == 0) {
-            close(fenceFd);
-        } else {
+        close(fenceFd);
+        if (err != 0) {
             anw->cancelBuffer(anw, *anb, fenceFd);
             *anb = NULL;
         }