| commit | 3d9a26c2a8739657668263922068c7e211dfabc9 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 26 18:37:22 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 26 18:37:22 2020 +0000 |
| tree | c9b0e54c9dcb278bba82fb4cdede5e338e7d4fc3 | |
| parent | 37b8311b77a610641b1d5dc753844fde143a563d [diff] | |
| parent | e3db0378e86d2f4cc5efe9cd46f8f0a68dc07ffc [diff] |
Merge "gralloc4-vts: don't wait on invalid sync fence" into rvc-dev am: a66c632f8f am: e3db0378e8 Change-Id: Ic50eb56d09598b8db3671faac73c018102f20be9
diff --git a/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp b/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp index 0d6f5af..295ba36 100644 --- a/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp +++ b/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp
@@ -727,8 +727,10 @@ int fence; ASSERT_NO_FATAL_FAILURE(fence = mGralloc->flushLockedBuffer(writeBufferHandle)); - ASSERT_EQ(0, sync_wait(fence, 3500)); - close(fence); + if (fence >= 0) { + ASSERT_EQ(0, sync_wait(fence, 3500)); + close(fence); + } ASSERT_NO_FATAL_FAILURE(mGralloc->rereadLockedBuffer(readBufferHandle));