Merge "BlendMode VTS tests"
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp
index 686299a..e0a45d2 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/vts/functional/VtsHalGraphicsComposer3_ReadbackTest.cpp
@@ -1058,6 +1058,9 @@
public:
void SetUp() override {
SetUpBase(std::get<0>(GetParam()));
+ // TODO(b/219590743) we should remove the below SRGB color mode
+ // once we have the BlendMode test fix for all the versions of the ColorMode
+ mTestColorModes = {ColorMode::SRGB};
mBackgroundColor = BLACK;
mTopLayerColor = RED;
}
@@ -1135,8 +1138,8 @@
Color mBackgroundColor;
Color mTopLayerColor;
};
-
-TEST_P(GraphicsBlendModeCompositionTest, None) {
+// TODO(b/219576457) Enable tests once we have fixed the bug on composer.
+TEST_P(GraphicsBlendModeCompositionTest, DISABLED_None) {
for (ColorMode mode : mTestColorModes) {
EXPECT_TRUE(mComposerClient
->setColorMode(getPrimaryDisplayId(), mode, RenderIntent::COLORIMETRIC)
@@ -1180,7 +1183,8 @@
}
}
-TEST_P(GraphicsBlendModeCompositionTest, Coverage) {
+// TODO(b/219737571) Enable test for HWC3.0 after we matched with 2.4
+TEST_P(GraphicsBlendModeCompositionTest, DISABLED_Coverage) {
for (ColorMode mode : mTestColorModes) {
EXPECT_TRUE(mComposerClient
->setColorMode(getPrimaryDisplayId(), mode, RenderIntent::COLORIMETRIC)