Merge "composer: 2.4: VTS using old value for parameter" into rvc-dev am: 32e3cd9a02 am: 247528e180 am: 034e764769

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

Change-Id: I84b6877662e3a8efb50a54fd404291c6ad88224c
This commit is contained in:
TreeHugger Robot
2020-07-14 19:41:25 +00:00
committed by Automerger Merge Worker

View File

@@ -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);
}