commit 981a3c1a6683cf2a34f6a27835f1e84b41211f68
author Alec Mouri <alecmouri@google.com> Fri Jul 09 21:29:39 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 09 21:29:39 2021 +0000
tree f163335cb0e1afada6e24d0cfb78c44fa9abd4f1
parent aad945fce4c6a58287344ee49df484e3665155a1
parent f569528b19fb981b8060cfbe56159483456ff1dd

Merge "Clear composition changes when a color mode is not supported" into sc-dev am: f569528b19

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15244526

Change-Id: Ia3186d6d30fcaab371cee4adba50108a61fff515

graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp

diff --git a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp
index 7a1568b..7a053f1 100644
--- a/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp
+++ b/graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2ReadbackTest.cpp
@@ -458,6 +458,7 @@
                           << " pixel format: PixelFormat::RGBA_8888 dataspace: "
                           << ReadbackHelper::getDataspaceString(clientDataspace)
                           << " unsupported for display" << std::endl;
+                mReader->mCompositionChanges.clear();
                 continue;
             }