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

am: 4a09c8fb5e

Change-Id: Ie0df74a1390d880735ed05887dbc7a653e0dc7ee

1 files changed, 3 insertions, 0 deletions

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