commit a95ed9767082a796af296cebe79208a82d4b6c94
author Ady Abraham <adyabr@google.com> Thu Jul 01 00:14:53 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 01 00:14:53 2021 +0000
tree f2456a201dd78e44d3d9b24c124d41a5de016491
parent 6c9d4040983bf7a9d89abb4de612fbaa0d5c8a84
parent 1047e5eff4f92231530d28e6be82b6c24da5d4f1

Merge "SF: Update RefreshRateOverlay before SF applies transactions" into sc-dev

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 9c04fbf..8df0852 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1189,6 +1189,10 @@
     updatePhaseConfiguration(refreshRate);
     ATRACE_INT("ActiveConfigFPS", refreshRate.getValue());
 
+    if (mRefreshRateOverlay) {
+        mRefreshRateOverlay->changeRefreshRate(upcomingMode->getFps());
+    }
+
     if (mUpcomingActiveMode.event != Scheduler::ModeEvent::None) {
         const nsecs_t vsyncPeriod = refreshRate.getPeriodNsecs();
         const auto physicalId = display->getPhysicalId();
@@ -1271,9 +1275,6 @@
     }
 
     mScheduler->onNewVsyncPeriodChangeTimeline(outTimeline);
-    if (mRefreshRateOverlay) {
-        mRefreshRateOverlay->changeRefreshRate(desiredMode->getFps());
-    }
 
     // Scheduler will submit an empty frame to HWC if needed.
     mSetActiveModePending = true;