diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-08 10:03:31 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-08 10:03:31 +0000 |
| commit | 3447ecaca4a9f37be8acc4211ec2091afdbf11f2 (patch) | |
| tree | ff67c29c0ad7664169c515dbbe93be79826369bc | |
| parent | c0f05e0d8cd820336a698eebd2525e6839e49f37 (diff) | |
| parent | 4c0bb0a09ac04281e631c16ef98d15846c12ecda (diff) | |
| download | native-3447ecaca4a9f37be8acc4211ec2091afdbf11f2.tar.gz | |
release-request-011e6329-d82e-4e46-980f-68776b0cd6b9-for-git_oc-release-4080367 snap-temp-L79900000072116775
Change-Id: I445c782cff82ae51f60899ce837e1f714dd2a601
| -rw-r--r-- | libs/nativewindow/AHardwareBuffer.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/nativewindow/AHardwareBuffer.cpp b/libs/nativewindow/AHardwareBuffer.cpp index c0602e7417..2f4b996c75 100644 --- a/libs/nativewindow/AHardwareBuffer.cpp +++ b/libs/nativewindow/AHardwareBuffer.cpp @@ -134,7 +134,10 @@ int AHardwareBuffer_unlock(AHardwareBuffer* buffer, int32_t* fence) { if (!buffer) return BAD_VALUE; GraphicBuffer* gBuffer = AHardwareBuffer_to_GraphicBuffer(buffer); - return gBuffer->unlockAsync(fence); + if (fence == nullptr) + return gBuffer->unlock(); + else + return gBuffer->unlockAsync(fence); } int AHardwareBuffer_sendHandleToUnixSocket(const AHardwareBuffer* buffer, int socketFd) { |