commit 8fe617eaad645a9ba9b48d46c90cd8eee46010c1
author Daniel Jarai <daniel.jarai@bartec-pixavi.com> Thu Sep 21 17:17:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 17:17:22 2017 +0000
tree 128ea42cbefedc440d93c1933327baee02eb0bf0
parent 261b90e385c33b2fa1444635e1ceff4c8455d258
parent 8260e06c5095c7688eaede8b8f6d0889a57c7c6b

Merge "Avoid closing invalid fds in GraphicBufferMapper"
am: 8260e06c50

Change-Id: I09e5f50a60c5968350c64eb42bbd8ada273a62e3

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