commit 9e5d558d00df1b4e8349087718807f632236dea8
author Alec Mouri <alecmouri@google.com> Tue Apr 02 18:59:31 2019 -0700
committer Alec Mouri <alecmouri@google.com> Tue Apr 02 18:59:31 2019 -0700
tree 0d2679071b40291a07effebf0242dfb36dfe9165
parent 945a7006f905b5f460668923b9875cd6637931a6

Always set phase offsets in setRefreshRateTo.

Incremental syncs can cause SF's configuration to be out of sync with
HWC, which allows for bad phase offsets.

Test: dumpsys
Change-Id: Ide92a15853ce50cbff8b03e474956b96fb1e5c8b

services/surfaceflinger/SurfaceFlinger.cpp

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