| commit | 52a006eadb39c1b016b52c3a1e00c3a47c744086 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 26 18:20:18 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 26 18:20:18 2020 +0000 |
| tree | 3311a86af37d87e464dd53d5706f8d476fc3f3f7 | |
| parent | 245718ca09dddc16d113868d121ac8efea4338f0 [diff] | |
| parent | a66c632f8f2104998c21f1af8bea8318429dcfa5 [diff] |
Merge "gralloc4-vts: don't wait on invalid sync fence" into rvc-dev am: a66c632f8f Change-Id: Iccc3537560fe1098f0ffbd0dd7ef4fa20aeb5084
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));