From 0ea9a17876bbb85817201c2091e563acf114950b Mon Sep 17 00:00:00 2001
From: Dmitry Skiba <dskiba@google.com>
Date: Fri, 6 Dec 2024 07:53:48 +0000
Subject: [PATCH] Add a way to disable auto prefer fit for launch.

This change introduces "is APF enabled" system properties, and
uses them as trigger conditions for APF nodes / pre-APF nodes.

By default APF nodes are active, and pre-APF nodes are inactive,
which maintains the situation before this change.

A future experiment will flip "is APF enabled" system properties,
deactivating APF nodes and activating pre-APF nodes. For more
info see go/pixel-perf-apf-experiment.

Bug: 365855872
Test: set vendor.powerhal.apf_enabled=false, vendor.powerhal.apf_disabled=true, observe auto_prefer_fit
procfs value staying "false" and instead preferred_idle_mask_mid
changing to 0xff during app launches
Flag: NONE powerhint change does not support flags
Change-Id: I45ba5311e46aa2c6b40705ff098889d47c6a2fa2
Signed-off-by: Dmitry Skiba <dskiba@google.com>
---
 device-comet.mk      |  5 +++++
 powerhint-comet.json | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/device-comet.mk b/device-comet.mk
index 0bb19c3..4394e07 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -543,3 +543,8 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_COPY_FILES += \
     device/google/comet/bluetooth/audio_set_configurations.json:$(TARGET_COPY_OUT_VENDOR)/etc/aidl/le_audio/aidl_audio_set_configurations.json
+
+# Enable APF by default
+PRODUCT_VENDOR_PROPERTIES += \
+    vendor.powerhal.apf_disabled=false \
+    vendor.powerhal.apf_enabled=true
diff --git a/powerhint-comet.json b/powerhint-comet.json
index fdbce21..4e80e57 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -1097,6 +1097,13 @@
       "Duration": 5000,
       "Value": "512"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAUClampBoost",
+      "Duration": 5000,
+      "Value": "765",
+      "EnableProperty": "vendor.powerhal.apf_disabled"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "FGUClampBoost",
@@ -1284,7 +1291,8 @@
       "PowerHint": "LAUNCH",
       "Node": "TAAutoPreferFit",
       "Duration": 5000,
-      "Value": "1"
+      "Value": "1",
+      "EnableProperty": "vendor.powerhal.apf_enabled"
     },
     {
       "PowerHint": "LAUNCH",
@@ -1292,35 +1300,47 @@
       "Duration": 5000,
       "Value": "0xff"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "TAPreferredIdleMaskMid",
+      "Duration": 5000,
+      "Value": "0xff",
+      "EnableProperty": "vendor.powerhal.apf_disabled"
+    },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUclampMinOnNiceEnable",
       "Duration": 5000,
-      "Value": "1"
+      "Value": "1",
+      "EnableProperty": "vendor.powerhal.apf_enabled"
     },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUclampMinOnNiceHighValue",
-       "Duration": 5000,
-       "Value": "765"
+      "Duration": 5000,
+      "Value": "765",
+      "EnableProperty": "vendor.powerhal.apf_enabled"
     },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUclampMinOnNiceHighPrio",
       "Duration": 5000,
-      "Value": "110"
+      "Value": "110",
+      "EnableProperty": "vendor.powerhal.apf_enabled"
     },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUclampMinOnNiceMidValue",
-       "Duration": 5000,
-       "Value": "590"
+      "Duration": 5000,
+      "Value": "590",
+      "EnableProperty": "vendor.powerhal.apf_enabled"
     },
     {
       "PowerHint": "LAUNCH",
       "Node": "TAUclampMinOnNiceMidPrio",
       "Duration": 5000,
-      "Value": "139"
+      "Value": "139",
+      "EnableProperty": "vendor.powerhal.apf_enabled"
     },
     {
       "PowerHint": "LAUNCH",