commit 93bc83d7d196da49db17110694f16cc4d6b331da
author Alec Mouri <alecmouri@google.com> Wed Apr 17 14:47:43 2019 -0700
committer Alec Mouri <alecmouri@google.com> Fri May 10 11:43:45 2019 -0700
tree 18fe2b63343672631e1dec1eb4a4ec35e142a125
parent aa334d96b2c1be8b979eb1a67831bd599d54ef1f

Always set refresh rate change callback in scheduler

Otherwise, content fps detection never changes the panel refresh rate if
we don't use an idle timer.

Bug: 130684082
Bug: 131906818
Test: manual
Change-Id: I6248e485a0ae3de8f2253250412f7c4c4755b99a

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 8f7420f..66ccf54 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -695,13 +695,11 @@
         ALOGE("Run StartPropertySetThread failed!");
     }
 
-    if (mScheduler->isIdleTimerEnabled()) {
-        mScheduler->setChangeRefreshRateCallback(
-                [this](RefreshRateType type, Scheduler::ConfigEvent event) {
-                    Mutex::Autolock lock(mStateLock);
-                    setRefreshRateTo(type, event);
-                });
-    }
+    mScheduler->setChangeRefreshRateCallback(
+            [this](RefreshRateType type, Scheduler::ConfigEvent event) {
+                Mutex::Autolock lock(mStateLock);
+                setRefreshRateTo(type, event);
+            });
 
     mRefreshRateConfigs.populate(getHwComposer().getConfigs(*display->getId()));
     mRefreshRateStats.setConfigMode(getHwComposer().getActiveConfigIndex(*display->getId()));