From 2ff704a6d4ace107dcc76a74acbcc8b8c4616f9e Mon Sep 17 00:00:00 2001 From: Qoo Lin Date: Tue, 30 Aug 2022 12:32:56 +0800 Subject: [PATCH] Fix SetBadMetadata fail Align Android-T Bug: 244284552 Test: run vts -m VtsHalGraphicsMapperV4_0TargetTest Signed-off-by: Qoo Lin Change-Id: I722981dda3b3aba97f36407e50bd338d4812a723 --- .../vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp b/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp index f55a6b77ed..61277ee0bb 100644 --- a/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp +++ b/graphics/mapper/4.0/vts/functional/VtsHalGraphicsMapperV4_0TargetTest.cpp @@ -2001,6 +2001,11 @@ TEST_P(GraphicsMapperHidlTest, SetBadMetadata) { mGralloc->set(bufferHandle, gralloc4::MetadataType_Dataspace, vec)); ASSERT_EQ(Error::UNSUPPORTED, mGralloc->set(bufferHandle, gralloc4::MetadataType_BlendMode, vec)); + + // Keep optional metadata types below and populate the encoded metadata vec + // with some arbitrary different metadata because the common gralloc4::decode*() + // functions do not distinguish between an empty vec and bad value. + ASSERT_EQ(NO_ERROR, gralloc4::encodeDataspace(Dataspace::SRGB_LINEAR, &vec)); ASSERT_EQ(Error::UNSUPPORTED, mGralloc->set(bufferHandle, gralloc4::MetadataType_Smpte2086, vec)); ASSERT_EQ(Error::UNSUPPORTED,