commit b631837d399d67bc6f03181979074d316a18759e
author Ady Abraham <adyabr@google.com> Thu Jul 01 00:30:14 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 01 00:30:14 2021 +0000
tree 30e371b8da19bcf0329017563e699db47911259f
parent cd9e166a94b464d58ebdc0db448939541ccc9c00
parent a95ed9767082a796af296cebe79208a82d4b6c94

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15161679

Change-Id: Ia51b54212f3f8e00d39d485f5fe702b23dfa0af3

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 00bd787..194e698 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1190,6 +1190,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();
@@ -1272,9 +1276,6 @@
     }
 
     mScheduler->onNewVsyncPeriodChangeTimeline(outTimeline);
-    if (mRefreshRateOverlay) {
-        mRefreshRateOverlay->changeRefreshRate(desiredMode->getFps());
-    }
 
     // Scheduler will submit an empty frame to HWC if needed.
     mSetActiveModePending = true;