From 177effbccc1d77d6c9c222355e1e79edea4ae375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Wagner?= Date: Wed, 1 Nov 2023 18:10:01 +0000 Subject: Correct the error check on the lockBuffer path The backend can return -EINVAL or a (positive) gralloc error code. Account for it. Bug: 308432951 Test: New PTS EGLAHBLockTest Change-Id: I992af22eae67926c796d2eff072db108f7406be2 --- gralloc4/src/hidl_common/Mapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gralloc4/src/hidl_common/Mapper.cpp b/gralloc4/src/hidl_common/Mapper.cpp index 38d5377..e308cfe 100644 --- a/gralloc4/src/hidl_common/Mapper.cpp +++ b/gralloc4/src/hidl_common/Mapper.cpp @@ -215,7 +215,7 @@ static Error lockBuffer(buffer_handle_t bufferHandle, void* data = nullptr; if (mali_gralloc_lock(bufferHandle, cpuUsage, accessRegion.left, accessRegion.top, accessRegion.width, - accessRegion.height, &data) < 0) + accessRegion.height, &data) != 0) { return Error::BAD_VALUE; } -- cgit v1.2.3