commit 6d885930e9682733730f0001640a745fc9cdcf0c
author Ady Abraham <adyabr@google.com> Fri Sep 03 18:05:48 2021 -0700
committer Wiwit Rifa'i <wiwitrifai@google.com> Thu Sep 30 22:26:34 2021 +0800
tree b26cb6183c59b903eb4ed07382042cba084fc63f
parent 9a2ea34e62344b1630522a8d21252869f54d088d

SF: configure idle timer based on display id

Use the DisplayId when reading the timer configuration from system
properties.

Bug: 188838426
Test: check idle timer can be set separately for each display based
      on display id
Change-Id: I9051374a78d99676ace7f1ded6accc8a50b17c79

services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp

diff --git a/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp b/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp
index 011229e..ee1d730 100644
--- a/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp
+++ b/services/surfaceflinger/Scheduler/RefreshRateConfigs.cpp
@@ -685,19 +685,16 @@
 }
 
 void RefreshRateConfigs::initializeIdleTimer() {
-    const int setIdleTimerMs = base::GetIntProperty("debug.sf.set_idle_timer_ms", 0);
-
-    if (const auto millis = setIdleTimerMs ? setIdleTimerMs : sysprop::set_idle_timer_ms(0);
-        millis > 0) {
+    if (mConfig.idleTimerTimeoutMs > 0) {
         const auto getCallback = [this]() -> std::optional<IdleTimerCallbacks::Callbacks> {
             std::scoped_lock lock(mIdleTimerCallbacksMutex);
             if (!mIdleTimerCallbacks.has_value()) return {};
-            return mConfig.supportKernelTimer ? mIdleTimerCallbacks->kernel
-                                              : mIdleTimerCallbacks->platform;
+            return mConfig.supportKernelIdleTimer ? mIdleTimerCallbacks->kernel
+                                                  : mIdleTimerCallbacks->platform;
         };
 
         mIdleTimer.emplace(
-                "IdleTimer", std::chrono::milliseconds(millis),
+                "IdleTimer", std::chrono::milliseconds(mConfig.idleTimerTimeoutMs),
                 [getCallback] {
                     if (const auto callback = getCallback()) callback->onReset();
                 },
@@ -970,7 +967,8 @@
 
     base::StringAppendF(&result, "Supports Frame Rate Override: %s\n",
                         mSupportsFrameRateOverride ? "yes" : "no");
-    base::StringAppendF(&result, "Idle timer: %s\n",
+    base::StringAppendF(&result, "Idle timer: (%s) %s\n",
+                        mConfig.supportKernelIdleTimer ? "kernel" : "platform",
                         mIdleTimer ? mIdleTimer->dump().c_str() : "off");
     result.append("\n");
 }