summaryrefslogtreecommitdiff
path: root/libs/ui/GraphicBufferMapper.cpp
diff options
context:
space:
mode:
author Daniel Jarai <daniel.jarai@bartec-pixavi.com> 2017-09-21 17:17:22 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-21 17:17:22 +0000
commit8fe617eaad645a9ba9b48d46c90cd8eee46010c1 (patch)
tree128ea42cbefedc440d93c1933327baee02eb0bf0 /libs/ui/GraphicBufferMapper.cpp
parent261b90e385c33b2fa1444635e1ceff4c8455d258 (diff)
parent8260e06c5095c7688eaede8b8f6d0889a57c7c6b (diff)
Merge "Avoid closing invalid fds in GraphicBufferMapper"
am: 8260e06c50 Change-Id: I09e5f50a60c5968350c64eb42bbd8ada273a62e3
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);
}