commit 052d6f37e587de150143ec5f57cc1ad207a54f90
author Alec Mouri <alecmouri@google.com> Wed Apr 03 21:17:21 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 03 21:17:21 2019 +0000
tree eee91beccc9cea8c6c9dc379e299f8bacbd682e3
parent 24ade69d65946925fcfc10d40913fd2ff3a05629
parent 9e5d558d00df1b4e8349087718807f632236dea8

Merge "Always set phase offsets in setRefreshRateTo."

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index cf8cd7c..33455b9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1457,12 +1457,13 @@
         return;
     }
 
+    mPhaseOffsets->setRefreshRateType(refreshRate);
+
     const auto display = getDisplayDeviceLocked(displayToken);
     if (desiredConfigId == display->getActiveConfig()) {
         return;
     }
 
-    mPhaseOffsets->setRefreshRateType(refreshRate);
     setDesiredActiveConfig({refreshRate, desiredConfigId, getInternalDisplayTokenLocked(), event});
 }