summaryrefslogtreecommitdiff
path: root/libs/ui/GraphicBufferMapper.cpp
diff options
context:
space:
mode:
author Daniel Jarai <daniel.jarai@bartec-pixavi.com> 2017-09-21 17:26:06 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-21 17:26:06 +0000
commitdda5d5d7914297adb42e251e8aadaece4dc3e65a (patch)
tree41eb4c813cde6b89a7b251f732c7c328d8a6890d /libs/ui/GraphicBufferMapper.cpp
parentec9c7010ca1a184b0b3ca560189449b2ced86ba6 (diff)
parentb7d03db7b4fb60eeab0035add4789e5f94551625 (diff)
Merge "Avoid closing invalid fds in GraphicBufferMapper" am: 8260e06c50 am: 8fe617eaad am: 9ef13167c9
am: b7d03db7b4 Change-Id: Id3a7dc51c56b4e13d6969dae14d6fa5e68b85057
Diffstat (limited to 'libs/ui/GraphicBufferMapper.cpp')
-rw-r--r--libs/ui/GraphicBufferMapper.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/GraphicBufferMapper.cpp b/libs/ui/GraphicBufferMapper.cpp
index d52c508003..163432821f 100644
--- a/libs/ui/GraphicBufferMapper.cpp
+++ b/libs/ui/GraphicBufferMapper.cpp
@@ -99,7 +99,7 @@ status_t GraphicBufferMapper::unlock(buffer_handle_t handle)
{
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);
}