commit 6d1224944a2ea1b6a84b92a6f827b4e654c6e82d
author Ram Indani <ramindani@google.com> Wed Mar 02 16:16:55 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 02 16:16:55 2022 +0000
tree c309d392879be026413c198157e87f1ab4aa89af
parent 4553efd4225d60642d663d1ed98f83c22f6ca446
parent a4e7636e6230283eb9cd385fe3723fb39e33961b

Merge "Vts BlendMode tests skip for UNSUPPORTED ColorMode" into tm-dev

graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp

diff --git a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
index 4fadc17..147a9ee 100644
--- a/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
+++ b/graphics/composer/aidl/vts/VtsHalGraphicsComposer3_ReadbackTest.cpp
@@ -1051,7 +1051,10 @@
         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};
+        mTestColorModes.erase(
+                std::remove_if(mTestColorModes.begin(), mTestColorModes.end(),
+                               [](ColorMode mode) { return mode != ColorMode::SRGB; }),
+                mTestColorModes.end());
         mBackgroundColor = BLACK;
         mTopLayerColor = RED;
     }