commit b7d03db7b4fb60eeab0035add4789e5f94551625
author Daniel Jarai <daniel.jarai@bartec-pixavi.com> Thu Sep 21 17:21:21 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 17:21:21 2017 +0000
tree 668e8035d4423a4841b1e4aeb34e487a5a2a2838
parent c9275a3b7b5e0af921a5df3a0bfd8716baea7272
parent 9ef13167c929cea8ccf610d6c388b1a90e693d77

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

Change-Id: I2193d68e72ed234c2dc603ea485f89c1ea4eee19

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);
     }