commit 4a09c8fb5ee6526c281e2c3a454ffa2afabc7e09
author Chia-I Wu <olv@google.com> Thu May 18 00:36:50 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 18 00:36:50 2017 +0000
tree 3383c6670ddd17a51242378140cb339c7b56f3a8
parent c4edc50adb2cec91e7b1c5c5b4ed2f26a2a83d2e
parent 5c580eaeb6510fee596825d2435182cf9895ae10

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

Change-Id: I84760b3e922c4a3b6ea221bd04e3d24a8d932e22

services/surfaceflinger/DisplayHardware/HWC2.cpp

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