From eb79ff9e68a6a4167fd9477ed2ccf2fcca1a8ee1 Mon Sep 17 00:00:00 2001
From: Jimmy Shiu <jimmyshiu@google.com>
Date: Thu, 22 Aug 2024 01:05:54 +0000
Subject: [PATCH 1/2] PowerHint: Refine FIXED_PERFORMANCE mode CPU Frequencies

Set the CPU frequencies of FIXED_PERFORMANCE to align with Thermal CPU Light level.

Bug: 327070837
Test: Boot to home
Flag: NONE powerhal doesn't have a flag yet
Change-Id: Ibb698b608c21c2a4f81354f852cb077345907947
---
 perf/powerhint-husky.json | 15 +++++++++------
 perf/powerhint-shiba.json | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json
index 7b53b72..973dd45 100644
--- a/perf/powerhint-husky.json
+++ b/perf/powerhint-husky.json
@@ -97,6 +97,7 @@
       "Values": [
         "9999999",
         "1548000",
+        "1425000",
         "1197000",
         "0"
       ],
@@ -136,6 +137,7 @@
         "9999999",
         "2245000",
         "2130000",
+        "1572000",
         "1836000",
         "0"
       ],
@@ -177,6 +179,7 @@
         "2687000",
         "2363000",
         "2147000",
+        "1745000",
         "1885000",
         "0"
       ],
@@ -2624,37 +2627,37 @@
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1745000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1745000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1572000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUMidClusterMinFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1572000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1425000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1425000"
     },
     {
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",
diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json
index 18c9ef0..afdab3d 100644
--- a/perf/powerhint-shiba.json
+++ b/perf/powerhint-shiba.json
@@ -97,6 +97,7 @@
       "Values": [
         "9999999",
         "1548000",
+        "1425000",
         "1197000",
         "0"
       ],
@@ -132,6 +133,7 @@
       "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "1572000",
         "1836000",
         "0"
       ],
@@ -168,6 +170,7 @@
       "Path": "/sys/devices/system/cpu/cpu8/cpufreq/scaling_min_freq",
       "Values": [
         "9999999",
+        "1745000",
         "1885000",
         "0"
       ],
@@ -2157,7 +2160,7 @@
       "Duration": 0,
       "Value": "cam1"
     },
-   {
+    {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CPUUtilThreshold",
       "Duration": 0,
@@ -2529,37 +2532,37 @@
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1745000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMinFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1745000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1572000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUMidClusterMinFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1572000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPULittleClusterMaxFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1425000"
     },
     {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPULittleClusterMinFreq",
       "Duration": 0,
-      "Value": "9999999"
+      "Value": "1425000"
     },
     {
       "PowerHint": "LOW_POWER_LITTLE_CLUSTER_50",

From dcc325566beaa0850a75a1a9917e0338f297b865 Mon Sep 17 00:00:00 2001
From: Chris Paulo <chrispaulo@google.com>
Date: Wed, 25 Sep 2024 15:24:09 -0700
Subject: [PATCH 2/2] shusky/haptics: Remove voltage restriction for haptics

Remove the voltage restriction for haptics since DVL is enabled.  This
will allow FW control for exertion protection of the motor, and allow
for stronger output for audio-haptics.

Bug: 318476589
Flag: EXEMPT config xml change
Test: dumpsys vibrator_manager and accel measurement
Change-Id: Ic8ece936df599725ad1ab66089b0f66a3791e422
---
 husky/overlay/frameworks/base/core/res/res/values/config.xml   | 3 ---
 .../overlay/frameworks/base/core/res/res/values/config.xml     | 2 --
 shiba/overlay/frameworks/base/core/res/res/values/config.xml   | 3 ---
 3 files changed, 8 deletions(-)

diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml
index 893d3ba..a543d1a 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -300,9 +300,6 @@
 
     <bool name="config_safe_sound_dosage_enabled">true</bool>
 
-    <!-- The max vibration strength allowed in audio haptic channels. -->
-    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
-
     <!-- The maximum range of gamma adjustment possible using the screen
          auto-brightness adjustment setting. -->
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">105%</fraction>
diff --git a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml
index 40dd9d6..97d8b95 100644
--- a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml
@@ -231,6 +231,4 @@
           <item>283</item>
      </integer-array>
 
-    <!-- The max vibration strength allowed in audio haptic channels. -->
-    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
 </resources>
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index fcbbc46..b2a1a13 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -294,9 +294,6 @@
 
     <bool name="config_safe_sound_dosage_enabled">true</bool>
 
-    <!-- The max vibration strength allowed in audio haptic channels. -->
-    <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
-
     <!-- The maximum range of gamma adjustment possible using the screen
          auto-brightness adjustment setting. -->
     <fraction name="config_autoBrightnessAdjustmentMaxGamma">105%</fraction>