commit dda5d5d7914297adb42e251e8aadaece4dc3e65a
author Daniel Jarai <daniel.jarai@bartec-pixavi.com> Thu Sep 21 17:26:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 17:26:06 2017 +0000
tree 41eb4c813cde6b89a7b251f732c7c328d8a6890d
parent ec9c7010ca1a184b0b3ca560189449b2ced86ba6
parent b7d03db7b4fb60eeab0035add4789e5f94551625

Merge "Avoid closing invalid fds in GraphicBufferMapper" am: 8260e06c50 am: 8fe617eaad am: 9ef13167c9
am: b7d03db7b4

Change-Id: Id3a7dc51c56b4e13d6969dae14d6fa5e68b85057

libs/ui/GraphicBufferMapper.cpp

diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp
index d52c508..1634328 100644
--- a/libs/ui/GraphicBufferMapper.cpp
+++ b/libs/ui/GraphicBufferMapper.cpp
@@ -99,7 +99,7 @@
 {
     int32_t fenceFd = -1;
     status_t error = unlockAsync(handle, &fenceFd);
-    if (error == NO_ERROR) {
+    if (error == NO_ERROR && fenceFd >= 0) {
         sync_wait(fenceFd, -1);
         close(fenceFd);
     }