Merge "composer: 2.4: VTS using old value for parameter" into rvc-dev (32e3cd9a) · Commits · e / os / android_hardware_interfaces

graphics/composer/2.4/vts/functional/VtsHalGraphicsComposerV2_4TargetTest.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -493,16 +493,16 @@ void GraphicsComposerHidlCommandTest::Test_setActiveConfigWithConstraints(
		// At this point the refresh rate should have changed already, however in rare
		// cases the implementation might have missed the deadline. In this case a new
		// timeline should have been provided.
		auto newTimelime = mComposerCallback->takeLastVsyncPeriodChangeTimeline();
		auto newTimeline = mComposerCallback->takeLastVsyncPeriodChangeTimeline();
		if (timeline.refreshRequired && refreshMiss) {
		EXPECT_TRUE(newTimelime.has_value());
		EXPECT_TRUE(newTimeline.has_value());
		}

		if (newTimelime.has_value()) {
		if (timeline.refreshRequired) {
		sendRefreshFrame(&newTimelime.value());
		if (newTimeline.has_value()) {
		if (newTimeline->refreshRequired) {
		sendRefreshFrame(&newTimeline.value());
		}
		waitForVsyncPeriodChange(display, newTimelime.value(), constraints.desiredTimeNanos,
		waitForVsyncPeriodChange(display, newTimeline.value(), constraints.desiredTimeNanos,
		vsyncPeriod1, vsyncPeriod2);
		}