commit d497cdcb7f04f648b11b1bde13beb8e07a38bb5f
author Chia-I Wu <olv@google.com> Thu May 18 00:40:19 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 00:40:19 2017 +0000
tree 8e4f743c42514872b41f14b1521eb9da67946d9c
parent 135fcf3780916246ddbcb182f5d2c689205147e0
parent 4a09c8fb5ee6526c281e2c3a454ffa2afabc7e09

Merge "surfaceflinger: fix a release fence leak" into oc-dev am: 5c580eaeb6
am: 4a09c8fb5e

Change-Id: Ie0df74a1390d880735ed05887dbc7a653e0dc7ee

services/surfaceflinger/DisplayHardware/HWC2.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWC2.cpp b/services/surfaceflinger/DisplayHardware/HWC2.cpp
index 1ac203b..0366630 100644
--- a/services/surfaceflinger/DisplayHardware/HWC2.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWC2.cpp
@@ -593,6 +593,9 @@
         } else {
             ALOGE("getReleaseFences: invalid layer %" PRIu64
                     " found on display %" PRIu64, layerIds[element], mId);
+            for (; element < numElements; ++element) {
+                close(fenceFds[element]);
+            }
             return Error::BadLayer;
         }
     }