From 2f5aec702490b3f42531a3140b199eb150b00307 Mon Sep 17 00:00:00 2001 From: Midas Chien Date: Thu, 28 May 2020 22:15:41 +0800 Subject: [PATCH] composer: vts: send refresh frame even composition changes sendRefreshFrame is used to send refresh frame to composer, so even composition changes should present frame to composer. Bug: 157638511 Test: VtsHalGraphicsComposerV2_4TargetTest on C2, R3 Change-Id: I325668b7a75cbbe72841c424eb9fc43479ac48b6 --- .../VtsHalGraphicsComposerV2_4TargetTest.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp b/graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp index 27b633a409..00df7c78f3 100644 --- a/graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp +++ b/graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp @@ -414,12 +414,9 @@ void GraphicsComposerHidlCommandTest::sendRefreshFrame(const VsyncPeriodChangeTi mWriter->validateDisplay(); execute(); - if (mReader->mCompositionChanges.size() != 0) { - GTEST_SUCCEED() << "Composition change requested, skipping test"; - return; - } - ASSERT_EQ(0, mReader->mErrors.size()); + mReader->mCompositionChanges.clear(); + mWriter->presentDisplay(); execute(); ASSERT_EQ(0, mReader->mErrors.size()); @@ -427,8 +424,14 @@ void GraphicsComposerHidlCommandTest::sendRefreshFrame(const VsyncPeriodChangeTi mWriter->selectLayer(layer); auto handle2 = allocate(); ASSERT_NE(nullptr, handle2); + mWriter->setLayerBuffer(0, handle2, -1); mWriter->setLayerSurfaceDamage(std::vector(1, {0, 0, 10, 10})); + mWriter->validateDisplay(); + execute(); + ASSERT_EQ(0, mReader->mErrors.size()); + mReader->mCompositionChanges.clear(); + mWriter->presentDisplay(); execute(); }