summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtk07406 <richard-yc.wang@mediatek.com>2020-02-13 10:46:55 +0800
committerMichael Bestas <mkbestas@lineageos.org>2020-03-09 18:48:41 +0200
commit0b36f8d81199840e126930b4b226b4bb20b85b11 (patch)
treef242860d70a2ed5f79b72ba10bbe30c130b99d3c
parent2d28ba8c7b3ae420e6553a87e9e51e7b80b90e62 (diff)
downloadandroid_hardware_interfaces-0b36f8d81199840e126930b4b226b4bb20b85b11.tar.gz
android_hardware_interfaces-0b36f8d81199840e126930b4b226b4bb20b85b11.tar.bz2
android_hardware_interfaces-0b36f8d81199840e126930b4b226b4bb20b85b11.zip
Fix VTS fail for GraphicsMapperHidlTest
VTS_10 testing item VtsHalGraphicsMapperV2_1Target fail due to Gralloc0 HAL do not have return value : BAD_VALUE and BAD_BUFFER so add Error::BAD_VALUE and Error::BAD_BUFFER as return value to fix this VTS fail. Bug: 146034198 Test: ran VtsHalGraphicsMapperV2_1Target 10 times and it all pass. Change-Id: I792830ddf98cbf59de7d3a7b4dd4cf5f72269244 (cherry picked from commit e308ceb1e9940d1d90a11177782a7cfe8630bb95)
-rw-r--r--graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h b/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h
index 8540068a4..13df3bcbc 100644
--- a/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h
+++ b/graphics/mapper/2.1/utils/passthrough/include/mapper-passthrough/2.1/Gralloc0Hal.h
@@ -49,7 +49,12 @@ class Gralloc0HalImpl : public V2_0::passthrough::detail::Gralloc0HalImpl<Hal> {
mModule, bufferHandle, descriptorInfo.width, descriptorInfo.height,
static_cast<int32_t>(descriptorInfo.format),
static_cast<uint64_t>(descriptorInfo.usage), stride);
- return static_cast<Error>(ret);
+ if (ret == -EINVAL) {
+ return Error::BAD_BUFFER;
+ } else if (ret < 0) {
+ return Error::BAD_VALUE;
+ }
+ return Error::NONE;
}
Error getTransportSize(const native_handle_t* bufferHandle, uint32_t* outNumFds,
uint32_t* outNumInts) override {