From 0f77dbcff0de3c995d66336e9e77a89eb9ce14f2 Mon Sep 17 00:00:00 2001
From: James Huang <jamesshhuang@google.com>
Date: Thu, 14 Mar 2024 16:41:12 +0800
Subject: [PATCH 1/5] gps: Update gps.cfg for GNSS FW 4.15.0.150.P1

Add ENABLE_CAPS_OTDOA=1 to enable OTDOA by default
Remove below two value and set default by code:
- Chip_Configuration_GNSSConstConstraintDef
- LocTech_Constraints

Bug: 329328103
Test: Do VTS/CTS and GNSS sanity test.
Change-Id: Ie3fc504c558fa3760ac84702469c825db5634237
---
 location/user/gps.cfg      | 3 +--
 location/userdebug/gps.cfg | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index 33da69e..ea20559 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -21,8 +21,6 @@ ChipCfg_VDR_low_end_Time = 20
 Chip_Configuration_AidingConfiguration=0x00020046
 Chip_Configuration_RefClkControl=0x24
 Chip_Configuration_DCXO_CrystalType=0x11
-Chip_Configuration_GNSSConstConstraintDef = 0x60BF
-LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 bdsUsedInUSPolicy=2
 sbasUsedInUSPolicy=2
@@ -65,6 +63,7 @@ isUseUncalAccel=1
 
 GNSS_CARRIER_CONFIG_BEGIN
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 3d631ad..074837c 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -90,9 +90,6 @@ Chip_Configuration_DCXO_CrystalType=0x11
 #    Range should be 2000 to 3100
 #Chip_Configuration_DCXO_InflectionPoint=2855
 
-# L1 + L5 MCW
-Chip_Configuration_GNSSConstConstraintDef = 0x60BF
-LocTech_Constraints = 0x60BF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 
 ### 2C48 L1 only MCW ###
@@ -198,6 +195,7 @@ isUseUncalAccel=1
 GNSS_CARRIER_CONFIG_BEGIN
 # DEFAULT
 GNSS_CARRIER_ID=0
+ENABLE_CAPS_OTDOA=1
 ENABLE_2G_CP_CAPS_MSA=1
 ENABLE_2G_CP_CAPS_MSB=1
 ENABLE_3G_CP_CAPS_MSA=1

From 260bdb4424c034f916f5d3511b936c920d721234 Mon Sep 17 00:00:00 2001
From: "Kevin (Chung-Kai) Yang" <chungkaiyang@google.com>
Date: Thu, 14 Mar 2024 11:48:30 +0000
Subject: [PATCH 2/5] power_profile.xml: Update CPU Parameters for Comet

Test: manual test

Bug: 324079178
Change-Id: Ic3f1ebca3e69803a0e6e1f5c3f0f32c1bad73741
Signed-off-by: Kevin (Chung-Kai) Yang <chungkaiyang@google.com>
---
 .../base/core/res/res/xml/power_profile.xml   | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml

diff --git a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
new file mode 100644
index 0000000..dd14f6a
--- /dev/null
+++ b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2024, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<device name="Android">
+    <!-- Number of cores each CPU cluster contains -->
+    <array name="cpu.clusters.cores">
+      <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
+      <value>3</value> <!-- Cluster 1 has 3 cores (cpu4, cpu5, cpu6) -->
+      <value>1</value> <!-- Cluster 2 has 1 cores (cpu7) -->
+    </array>
+    <item name="cpu.suspend">9.28</item>
+    <item name="cpu.idle">22.71</item>
+    <item name="cpu.active">10.62</item>
+    <item name="cpu.cluster_power.cluster0">0</item>
+    <item name="cpu.cluster_power.cluster1">1.12</item>
+    <item name="cpu.cluster_power.cluster2">2.2</item>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster0">
+      <value>324000</value> <!-- 324 MHz CPU speed-->
+      <value>610000</value> <!-- 610 MHz CPU speed-->
+      <value>820000</value> <!-- 820 MHz CPU speed-->
+      <value>955000</value> <!-- 955 MHz CPU speed-->
+      <value>1098000</value> <!-- 1098 MHz CPU speed-->
+      <value>1197000</value> <!-- 1197 MHz CPU speed-->
+      <value>1328000</value> <!-- 1328 MHz CPU speed-->
+      <value>1425000</value> <!-- 1425 MHz CPU speed-->
+      <value>1548000</value> <!-- 1548 MHz CPU speed-->
+      <value>1696000</value> <!-- 1696 MHz CPU speed-->
+      <value>1849000</value> <!-- 1849 MHz CPU speed-->
+      <value>1950000</value> <!-- 1950 MHz CPU speed-->
+    </array>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster1">
+      <value>357000</value> <!-- 357 MHz CPU speed-->
+      <value>578000</value> <!-- 578 MHz CPU speed-->
+      <value>648000</value> <!-- 648 MHz CPU speed-->
+      <value>787000</value> <!-- 787 MHz CPU speed-->
+      <value>910000</value> <!-- 910 MHz CPU speed-->
+      <value>1065000</value> <!-- 1065 MHz CPU speed-->
+      <value>1221000</value> <!-- 1221 MHz CPU speed-->
+      <value>1328000</value> <!-- 1328 MHz CPU speed-->
+      <value>1418000</value> <!-- 1418 MHz CPU speed-->
+      <value>1549000</value> <!-- 1549 MHz CPU speed-->
+      <value>1795000</value> <!-- 1795 MHz CPU speed-->
+      <value>1945000</value> <!-- 1945 MHz CPU speed-->
+      <value>2130000</value> <!-- 2130 MHz CPU speed-->
+      <value>2245000</value> <!-- 2245 MHz CPU speed-->
+      <value>2367000</value> <!-- 2367 MHz CPU speed-->
+      <value>2450000</value> <!-- 2450 MHz CPU speed-->
+      <value>2600000</value> <!-- 2600 MHz CPU speed-->
+    </array>
+    <!-- Different CPU speeds as reported in
+         /sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
+    <array name="cpu.core_speeds.cluster2">
+      <value>700000</value> <!-- 700 MHz CPU speed-->
+      <value>1164000</value> <!-- 1164 MHz CPU speed-->
+      <value>1296000</value> <!-- 1296 MHz CPU speed-->
+      <value>1557000</value> <!-- 1557 MHz CPU speed-->
+      <value>1745000</value> <!-- 1745 MHz CPU speed-->
+      <value>1885000</value> <!-- 1885 MHz CPU speed-->
+      <value>1999000</value> <!-- 1999 MHz CPU speed-->
+      <value>2147000</value> <!-- 2147 MHz CPU speed-->
+      <value>2294000</value> <!-- 2294 MHz CPU speed-->
+      <value>2363000</value> <!-- 2363 MHz CPU speed-->
+      <value>2499000</value> <!-- 2499 MHz CPU speed-->
+      <value>2687000</value> <!-- 2687 MHz CPU speed-->
+      <value>2802000</value> <!-- 2802 MHz CPU speed-->
+      <value>2914000</value> <!-- 2914 MHz CPU speed-->
+      <value>2943000</value> <!-- 2943 MHz CPU speed-->
+      <value>2970000</value> <!-- 2970 MHz CPU speed-->
+      <value>3015000</value> <!-- 3015 MHz CPU speed-->
+      <value>3105000</value> <!-- 3105 MHz CPU speed-->
+    </array>
+    <!-- Additional power used by a CPU core from cluster 0 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster0">
+      <value>1.27</value> <!-- 324 MHz CPU speed-->
+      <value>5.87</value> <!-- 610 MHz CPU speed-->
+      <value>6.5</value> <!-- 820 MHz CPU speed-->
+      <value>7.93</value> <!-- 955 MHz CPU speed-->
+      <value>10.5</value> <!-- 1098 MHz CPU speed-->
+      <value>14.06</value> <!-- 1197 MHz CPU speed-->
+      <value>16.18</value> <!-- 1328 MHz CPU speed-->
+      <value>17.65</value> <!-- 1425 MHz CPU speed-->
+      <value>20.92</value> <!-- 1548 MHz CPU speed-->
+      <value>24.67</value> <!-- 1696 MHz CPU speed-->
+      <value>34.09</value> <!-- 1849 MHz CPU speed-->
+      <value>47.41</value> <!-- 1950 MHz CPU speed-->
+    </array>
+    <!-- Additional power used by a CPU core from cluster 1 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster1">
+      <value>5.4</value> <!-- 357 MHz CPU speed-->
+      <value>8.9</value> <!-- 578 MHz CPU speed-->
+      <value>9.9</value> <!-- 648 MHz CPU speed-->
+      <value>12.65</value> <!-- 787 MHz CPU speed-->
+      <value>14.65</value> <!-- 910 MHz CPU speed-->
+      <value>18.15</value> <!-- 1065 MHz CPU speed-->
+      <value>22.65</value> <!-- 1221 MHz CPU speed-->
+      <value>25.15</value> <!-- 1328 MHz CPU speed-->
+      <value>28.65</value> <!-- 1418 MHz CPU speed-->
+      <value>33.9</value> <!-- 1549 MHz CPU speed-->
+      <value>46.4</value> <!-- 1795 MHz CPU speed-->
+      <value>56.9</value> <!-- 1945 MHz CPU speed-->
+      <value>71.15</value> <!-- 2130 MHz CPU speed-->
+      <value>81.4</value> <!-- 2245 MHz CPU speed-->
+      <value>92.9</value> <!-- 2367 MHz CPU speed-->
+      <value>102.4</value> <!-- 2450 MHz CPU speed-->
+      <value>124.9</value> <!-- 2600 MHz CPU speed-->
+    </array>
+    <!-- Additional power used by a CPU core from cluster 2 when running at
+         different speeds, excluding cluster and active cost -->
+    <array name="cpu.core_power.cluster2">
+      <value>16.91</value> <!-- 700 MHz CPU speed-->
+      <value>29.84</value> <!-- 1164 MHz CPU speed-->
+      <value>39.6</value> <!-- 1296 MHz CPU speed-->
+      <value>47.85</value> <!-- 1557 MHz CPU speed-->
+      <value>58.03</value> <!-- 1745 MHz CPU speed-->
+      <value>66.96</value> <!-- 1885 MHz CPU speed-->
+      <value>74.66</value> <!-- 1999 MHz CPU speed-->
+      <value>87.45</value> <!-- 2147 MHz CPU speed-->
+      <value>102.03</value> <!-- 2294 MHz CPU speed-->
+      <value>110.83</value> <!-- 2363 MHz CPU speed-->
+      <value>130.63</value> <!-- 2499 MHz CPU speed-->
+      <value>165.41</value> <!-- 2687 MHz CPU speed-->
+      <value>193.74</value> <!-- 2802 MHz CPU speed-->
+      <value>229.21</value> <!-- 2914 MHz CPU speed-->
+      <value>238.15</value> <!-- 2943 MHz CPU speed-->
+      <value>244.34</value> <!-- 2970 MHz CPU speed-->
+      <value>251.35</value> <!-- 3015 MHz CPU speed-->
+      <value>253.83</value> <!-- 3105 MHz CPU speed-->
+    </array>
+    <!-- Additional power used when screen is ambient mode -->
+    <item name="ambient.on">32</item>
+    <!-- Additional power used when screen is turned on at minimum brightness -->
+    <item name="screen.on">98</item>
+    <!-- Additional power used when screen is at maximum brightness, compared to
+         screen at minimum brightness -->
+    <item name="screen.full">470</item>
+    <!-- Average power used by the camera flash module when on -->
+    <item name="camera.flashlight">240.47</item>
+    <!-- Average power use by the camera subsystem for a typical camera
+         application. Intended as a rough estimate for an application running a
+         preview and capturing approximately 10 full-resolution pictures per
+         minute. -->
+    <item name="camera.avg">900</item>
+    <!-- Additional power used when video is playing -->
+    <item name="video">25</item>
+    <!-- Additional power used when audio is playing -->
+    <item name="audio">75</item>
+    <!-- Cellular modem related values.-->
+    <item name="modem.controller.sleep">0</item>
+    <item name="modem.controller.idle">156</item>
+    <item name="modem.controller.rx">145</item>
+    <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
+        <value>153</value>
+        <value>212</value>
+        <value>292</value>
+        <value>359</value>
+        <value>471</value>
+    </array>
+    <item name="modem.controller.voltage">3700</item>
+    <!-- GPS related values.-->
+    <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
+        <value>28</value>
+        <value>5</value>
+    </array>
+    <item name="gps.voltage">3700</item>
+    <!-- Idle Receive current for wifi radio in mA.-->
+    <item name="wifi.controller.idle">79</item>
+    <!-- Rx current for wifi radio in mA.-->
+    <item name="wifi.controller.rx">118</item>
+    <!-- Tx current for wifi radio in mA-->
+    <item name="wifi.controller.tx">331</item>
+    <!-- Operating voltage for wifi radio in mV.-->
+    <item name="wifi.controller.voltage">3700</item>
+</device>

From 52f6cf708f276843f29dc525a547fdaed748a32f Mon Sep 17 00:00:00 2001
From: "Kevin (Chung-Kai) Yang" <chungkaiyang@google.com>
Date: Thu, 14 Mar 2024 12:05:52 +0000
Subject: [PATCH 3/5] Revert "power_profile: initialize comet
 power_profile.xml"

Revert submission 26498470-init_zuma_pro_power_profile

Reason for revert: This may cause conflict on other branches.

Reverted changes: /q/submissionid:26498470-init_zuma_pro_power_profile

Bug: 324079178
Change-Id: I7dcc331eee9362f67f2ecfe56e30207f10a6e703
---
 .../base/core/res/res/xml/power_profile.xml   | 194 ------------------
 1 file changed, 194 deletions(-)
 delete mode 100644 comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml

diff --git a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
deleted file mode 100644
index 6242a6c..0000000
--- a/comet/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-**
-** Copyright 2024, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License")
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<device name="Android">
-    <!-- Number of cores each CPU cluster contains -->
-    <array name="cpu.clusters.cores">
-      <value>4</value> <!-- Cluster 0 has 4 cores (cpu0, cpu1, cpu2, cpu3) -->
-      <value>3</value> <!-- Cluster 1 has 3 cores (cpu4, cpu5, cpu6) -->
-      <value>1</value> <!-- Cluster 2 has 1 cores (cpu7) -->
-    </array>
-    <item name="cpu.suspend">10</item>
-    <item name="cpu.idle">28.6</item>
-    <item name="cpu.active">12.37</item>
-    <item name="cpu.cluster_power.cluster0">0.24</item>
-    <item name="cpu.cluster_power.cluster1">3.23</item>
-    <item name="cpu.cluster_power.cluster2">5.94</item>
-    <!-- Different CPU speeds as reported in
-         /sys/devices/system/cpu/cpufreq/ploicy0/scaling_available_frequencies -->
-    <array name="cpu.core_speeds.cluster0">
-      <value>324000</value> <!-- 324 MHz CPU speed-->
-      <value>610000</value> <!-- 610 MHz CPU speed-->
-      <value>820000</value> <!-- 820 MHz CPU speed-->
-      <value>955000</value> <!-- 955 MHz CPU speed-->
-      <value>1098000</value> <!-- 1098 MHz CPU speed-->
-      <value>1197000</value> <!-- 1197 MHz CPU speed-->
-      <value>1328000</value> <!-- 1328 MHz CPU speed-->
-      <value>1425000</value> <!-- 1425 MHz CPU speed-->
-      <value>1548000</value> <!-- 1548 MHz CPU speed-->
-      <value>1696000</value> <!-- 1696 MHz CPU speed-->
-      <value>1849000</value> <!-- 1849 MHz CPU speed-->
-      <value>1950000</value> <!-- 1950 MHz CPU speed-->
-    </array>
-    <!-- Different CPU speeds as reported in
-         /sys/devices/system/cpu/cpufreq/ploicy4/scaling_available_frequencies -->
-    <array name="cpu.core_speeds.cluster1">
-      <value>357000</value> <!-- 357 MHz CPU speed-->
-      <value>578000</value> <!-- 578 MHz CPU speed-->
-      <value>648000</value> <!-- 648 MHz CPU speed-->
-      <value>787000</value> <!-- 787 MHz CPU speed-->
-      <value>910000</value> <!-- 910 MHz CPU speed-->
-      <value>1065000</value> <!-- 1065 MHz CPU speed-->
-      <value>1221000</value> <!-- 1221 MHz CPU speed-->
-      <value>1328000</value> <!-- 1328 MHz CPU speed-->
-      <value>1418000</value> <!-- 1418 MHz CPU speed-->
-      <value>1549000</value> <!-- 1549 MHz CPU speed-->
-      <value>1795000</value> <!-- 1795 MHz CPU speed-->
-      <value>1945000</value> <!-- 1945 MHz CPU speed-->
-      <value>2130000</value> <!-- 2130 MHz CPU speed-->
-      <value>2245000</value> <!-- 2245 MHz CPU speed-->
-      <value>2367000</value> <!-- 2367 MHz CPU speed-->
-      <value>2450000</value> <!-- 2450 MHz CPU speed-->
-      <value>2600000</value> <!-- 2600 MHz CPU speed-->
-    </array>
-    <!-- Different CPU speeds as reported in
-         /sys/devices/system/cpu/cpufreq/ploicy6/scaling_available_frequencies -->
-    <array name="cpu.core_speeds.cluster2">
-      <value>700000</value> <!-- 700 MHz CPU speed-->
-      <value>1164000</value> <!-- 1164 MHz CPU speed-->
-      <value>1296000</value> <!-- 1296 MHz CPU speed-->
-      <value>1557000</value> <!-- 1557 MHz CPU speed-->
-      <value>1745000</value> <!-- 1745 MHz CPU speed-->
-      <value>1885000</value> <!-- 1885 MHz CPU speed-->
-      <value>1999000</value> <!-- 1999 MHz CPU speed-->
-      <value>2147000</value> <!-- 2147 MHz CPU speed-->
-      <value>2294000</value> <!-- 2294 MHz CPU speed-->
-      <value>2363000</value> <!-- 2363 MHz CPU speed-->
-      <value>2499000</value> <!-- 2499 MHz CPU speed-->
-      <value>2687000</value> <!-- 2687 MHz CPU speed-->
-      <value>2802000</value> <!-- 2802 MHz CPU speed-->
-      <value>2914000</value> <!-- 2914 MHz CPU speed-->
-      <value>2943000</value> <!-- 2943 MHz CPU speed-->
-      <value>2970000</value> <!-- 2970 MHz CPU speed-->
-      <value>3015000</value> <!-- 3015 MHz CPU speed-->
-      <value>3105000</value> <!-- 3105 MHz CPU speed-->
-    </array>
-    <!-- Additional power used by a CPU core from cluster 0 when running at
-         different speeds, excluding cluster and active cost -->
-    <array name="cpu.core_power.cluster0">
-      <value>1.89</value> <!-- 324 MHz CPU speed -->
-      <value>6.15</value> <!-- 610 MHz CPU speed -->
-      <value>9.34</value> <!-- 820 MHz CPU speed -->
-      <value>14.22</value> <!-- 955 MHz CPU speed -->
-      <value>18.94</value> <!-- 1098 MHz CPU speed -->
-      <value>21.98</value> <!-- 1197 MHz CPU speed -->
-      <value>26.83</value> <!-- 1328 MHz CPU speed -->
-      <value>30.17</value> <!-- 1425 MHz CPU speed -->
-      <value>41.55</value> <!-- 1548 MHz CPU speed -->
-      <value>48.36</value> <!-- 1696 MHz CPU speed -->
-      <value>58.45</value> <!-- 1849 MHz CPU speed -->
-      <value>68</value> <!-- 1950 MHz CPU speed -->
-    </array>
-    <!-- Additional power used by a CPU core from cluster 1 when running at
-         different speeds, excluding cluster and active cost -->
-    <array name="cpu.core_power.cluster1">
-      <value>6.5</value> <!-- 357 MHz CPU speed-->
-      <value>10</value> <!-- 578 MHz CPU speed-->
-      <value>11</value> <!-- 648 MHz CPU speed-->
-      <value>13.75</value> <!-- 787 MHz CPU speed-->
-      <value>15.75</value> <!-- 910 MHz CPU speed-->
-      <value>19.25</value> <!-- 1065 MHz CPU speed-->
-      <value>23.75</value> <!-- 1221 MHz CPU speed-->
-      <value>26.25</value> <!-- 1328 MHz CPU speed-->
-      <value>29.75</value> <!-- 1418 MHz CPU speed-->
-      <value>35</value> <!-- 1549 MHz CPU speed-->
-      <value>47.5</value> <!-- 1795 MHz CPU speed-->
-      <value>58</value> <!-- 1945 MHz CPU speed-->
-      <value>72.25</value> <!-- 2130 MHz CPU speed-->
-      <value>82.5</value> <!-- 2245 MHz CPU speed-->
-      <value>94</value> <!-- 2367 MHz CPU speed-->
-      <value>103.5</value> <!-- 2450 MHz CPU speed-->
-      <value>126</value> <!-- 2600 MHz CPU speed-->
-    </array>
-    <!-- Additional power used by a CPU core from cluster 2 when running at
-         different speeds, excluding cluster and active cost -->
-    <array name="cpu.core_power.cluster2">
-      <value>19.11</value> <!-- 700 MHz CPU speed-->
-      <value>32.04</value> <!-- 1164 MHz CPU speed-->
-      <value>41.8</value> <!-- 1296 MHz CPU speed-->
-      <value>50.05</value> <!-- 1557 MHz CPU speed-->
-      <value>60.23</value> <!-- 1745 MHz CPU speed-->
-      <value>69.16</value> <!-- 1885 MHz CPU speed-->
-      <value>76.86</value> <!-- 1999 MHz CPU speed-->
-      <value>89.65</value> <!-- 2147 MHz CPU speed-->
-      <value>104.23</value> <!-- 2294 MHz CPU speed-->
-      <value>113.03</value> <!-- 2363 MHz CPU speed-->
-      <value>132.83</value> <!-- 2499 MHz CPU speed-->
-      <value>167.61</value> <!-- 2687 MHz CPU speed-->
-      <value>195.94</value> <!-- 2802 MHz CPU speed-->
-      <value>231.41</value> <!-- 2914 MHz CPU speed-->
-      <value>240.35</value> <!-- 2943 MHz CPU speed-->
-      <value>246.54</value> <!-- 2970 MHz CPU speed-->
-      <value>253.55</value> <!-- 3015 MHz CPU speed-->
-      <value>256.03</value> <!-- 3105 MHz CPU speed-->
-    </array>
-    <!-- Additional power used when screen is ambient mode -->
-    <item name="ambient.on">32</item>
-    <!-- Additional power used when screen is turned on at minimum brightness -->
-    <item name="screen.on">98</item>
-    <!-- Additional power used when screen is at maximum brightness, compared to
-         screen at minimum brightness -->
-    <item name="screen.full">470</item>
-    <!-- Average power used by the camera flash module when on -->
-    <item name="camera.flashlight">240.47</item>
-    <!-- Average power use by the camera subsystem for a typical camera
-         application. Intended as a rough estimate for an application running a
-         preview and capturing approximately 10 full-resolution pictures per
-         minute. -->
-    <item name="camera.avg">900</item>
-    <!-- Additional power used when video is playing -->
-    <item name="video">25</item>
-    <!-- Additional power used when audio is playing -->
-    <item name="audio">75</item>
-    <!-- Cellular modem related values.-->
-    <item name="modem.controller.sleep">0</item>
-    <item name="modem.controller.idle">156</item>
-    <item name="modem.controller.rx">145</item>
-    <array name="modem.controller.tx"> <!-- Strength 0 to 4 -->
-        <value>153</value>
-        <value>212</value>
-        <value>292</value>
-        <value>359</value>
-        <value>471</value>
-    </array>
-    <item name="modem.controller.voltage">3700</item>
-    <!-- GPS related values.-->
-    <array name="gps.signalqualitybased"> <!-- Strength 0 to 1 -->
-        <value>28</value>
-        <value>5</value>
-    </array>
-    <item name="gps.voltage">3700</item>
-    <!-- Idle Receive current for wifi radio in mA.-->
-    <item name="wifi.controller.idle">79</item>
-    <!-- Rx current for wifi radio in mA.-->
-    <item name="wifi.controller.rx">118</item>
-    <!-- Tx current for wifi radio in mA-->
-    <item name="wifi.controller.tx">331</item>
-    <!-- Operating voltage for wifi radio in mV.-->
-    <item name="wifi.controller.voltage">3700</item>
-</device>

From e70e81621b178362009811bedd2cbfb24ac15a8b Mon Sep 17 00:00:00 2001
From: Chungkai Mei <chungkai@google.com>
Date: Mon, 4 Mar 2024 06:14:57 +0000
Subject: [PATCH 4/5] powerhint: port util threshold change to comet

Change util_threshold for little cluster to 50%. Keep value at 1280 for
CAMERA_STREAMING_LOW/CAMERA_STREAMING_STANDARD

Bug: b/316035859
Test: a/b UIBench test in lab
Change-Id: I594dd8ccecef6e26dd2c7ae73b4bee79f39f838c
Signed-off-by: Chungkai Mei <chungkai@google.com>
---
 powerhint-comet.json | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index c5fe44a..499dfac 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -237,9 +237,10 @@
       "Name": "CPUUtilThreshold",
       "Path": "/proc/vendor_sched/util_threshold",
       "Values": [
+        "2048 1280 1280",
         "1280",
         "1100",
-        "1100 1024 1100"
+        "1100 1078 1024"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -1874,7 +1875,7 @@
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
       "Value": "1280 1100 1055"
-    },
+    }
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
@@ -1941,6 +1942,12 @@
       "Duration": 0,
       "Value": "1"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "CPUUtilThreshold",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "CDPreferHighCap",

From e239802407df15e11aa72b40f6a138994d5d7a16 Mon Sep 17 00:00:00 2001
From: Chungkai Mei <chungkai@google.com>
Date: Thu, 14 Mar 2024 09:39:05 +0000
Subject: [PATCH 5/5] powerhint: port dvfs_headroom settings from caimito

Bug: 322000346
Test: a/b UIBench test
Change-Id: I50d3eccc1e663ac5db3792c98a6a73a297a888e3
Signed-off-by: Chungkai Mei <chungkai@google.com>
---
 powerhint-comet.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/powerhint-comet.json b/powerhint-comet.json
index 499dfac..669e27c 100644
--- a/powerhint-comet.json
+++ b/powerhint-comet.json
@@ -251,7 +251,7 @@
       "Values": [
         "1280",
         "1100",
-        "1280 1100 1055"
+        "1100 1078 1024"
       ],
       "DefaultIndex": 0,
       "ResetOnInit": true
@@ -1718,7 +1718,7 @@
       "PowerHint": "CAMERA_STREAMING_HIGH",
       "Node": "CPUDVFSHeadroom",
       "Duration": 0,
-      "Value": "1100"
+      "Value": "1100 1078 1024"
     },
     {
       "PowerHint": "CAMERA_STREAMING_HIGH",
@@ -1792,6 +1792,12 @@
       "Duration": 0,
       "Value": "700000"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_STANDARD",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "PowerHALCameraRunning",
@@ -1864,18 +1870,6 @@
       "Duration": 0,
       "Value": "cam2"
     },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUUtilThreshold",
-      "Duration": 0,
-      "Value": "1100 1024 1100"
-    },
-    {
-      "PowerHint": "CAMERA_STREAMING_STANDARD",
-      "Node": "CPUDVFSHeadroom",
-      "Duration": 0,
-      "Value": "1280 1100 1055"
-    }
     {
       "PowerHint": "CAMERA_STREAMING_STANDARD",
       "Node": "CDPreferHighCap",
@@ -1936,6 +1930,12 @@
       "Duration": 0,
       "Value": "camera"
     },
+    {
+      "PowerHint": "CAMERA_STREAMING_LOW",
+      "Node": "CPUDVFSHeadroom",
+      "Duration": 0,
+      "Value": "1280"
+    },
     {
       "PowerHint": "CAMERA_STREAMING_LOW",
       "Node": "PowerHALCameraRunning",
@@ -2118,13 +2118,13 @@
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUUtilThreshold",
+      "Node": "CPUDVFSHeadroom",
       "Duration": 0,
       "Value": "1100"
     },
     {
       "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
-      "Node": "CPUDVFSHeadroom",
+      "Node": "CPUUtilThreshold",
       "Duration": 0,
       "Value": "1100"
     },