commit 861d68fdf0a800cffbaa95603c4f2945655a7587
author Mathias Agopian <mathias@google.com> Thu Sep 20 15:46:09 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 20 15:46:09 2012 -0700
tree 4b147f3d9fd1cd36232a0ae6e83b181eb4cdc961
parent 29dfe83bf05807ce0b4068a8267632b7ceadbda5
parent 51d53ca5afa3e8b5a2c262723550393a49b19292

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

* commit '51d53ca5afa3e8b5a2c262723550393a49b19292':
  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;
         }