commit dd78c27a47570d8bf851aa21e481311e12f492c6
author Dan Stoza <stoza@google.com> Thu Jun 19 17:29:24 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 17 21:43:29 2014 +0000
tree b68f7d4769ef661b95129f123647b434e7f5b88a
parent 6df127cfbc62652a378abdc7767424e3ded8e517
parent 4f738c9717abda68a4d93157d978cb631d494a2f

Merge "HWComposer: Fix an fd leak on boot with HDMI"

libhwc/hwc.cpp

diff --git a/libhwc/hwc.cpp b/libhwc/hwc.cpp
index 546b047..94e8c59 100644
--- a/libhwc/hwc.cpp
+++ b/libhwc/hwc.cpp
@@ -1616,6 +1616,10 @@
                     contents->retireFenceFd = merged;
                 }
             } else {
+                if (layer.acquireFenceFd >= 0) {
+                    close(layer.acquireFenceFd);
+                    layer.acquireFenceFd = -1;
+                }
                 hdmi_hide_layer(pdev, pdev->hdmi_layers[1]);
             }
         }