commit 61e6bc5b7165408ff271b708a1196c4d6868a7c1
author Mathias Agopian <mathias@google.com> Fri Sep 21 13:32:36 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 21 13:32:36 2012 -0700
tree 29a4396fc6a8ff090dac01033e3a405201349d0c
parent fdecfc876e868ffcebc5d1eab0519bc7cb10e520
parent 37bd30bfd59a352452aea474ece764a6a14f71a9

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

* commit '37bd30bfd59a352452aea474ece764a6a14f71a9':
  ANW: fix an fd leak

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;
         }