commit 26f08b4b74f144282f6a5216086ca57e4305da35
author ramindani <ramindani@google.com> Fri Jan 05 15:20:48 2024 -0800
committer ramindani <ramindani@google.com> Mon Jan 08 10:06:35 2024 -0800
tree c22c6d8762cfb0a2e2f707cf76e862d229a15c1d
parent b02ac540b9b6372afd971f2a08aeb3a2f3f2103d

Avoid calling onVsyncGenerated when vrrConfig is not available

Test: atest VSyncPredictorTest
BUG: 318537314
Change-Id: I7705a572e761fd595298afb980b00f8638fa9763

services/surfaceflinger/Scheduler/VSyncPredictor.cpp

diff --git a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp
index 28e35de..6e12b33 100644
--- a/services/surfaceflinger/Scheduler/VSyncPredictor.cpp
+++ b/services/surfaceflinger/Scheduler/VSyncPredictor.cpp
@@ -313,7 +313,7 @@
             ? std::max(timePoint, *lastVsyncOpt + minFramePeriod - threshold)
             : timePoint;
     const auto vsyncTime = snapToVsyncAlignedWithRenderRate(baseTime);
-    if (FlagManager::getInstance().vrr_config()) {
+    if (FlagManager::getInstance().vrr_config() && mDisplayModePtr->getVrrConfig()) {
         const auto vsyncTimePoint = TimePoint::fromNs(vsyncTime);
         const Fps renderRate = mRenderRateOpt ? *mRenderRateOpt : mDisplayModePtr->getPeakFps();
         mVsyncTrackerCallback.onVsyncGenerated(vsyncTimePoint, mDisplayModePtr, renderRate);