From c440217900d195a2bedfb8b5a6d8b142ddbeac6b Mon Sep 17 00:00:00 2001
From: Sam Ou <samou@google.com>
Date: Thu, 23 Jun 2022 04:03:57 +0000
Subject: [PATCH 1/2] power_profile: update modem power numbers

Bug: 209525694
Signed-off-by: Sam Ou <samou@google.com>
Change-Id: Ie685e86feeb0ed3719b5cdebccd0a2218e2a2a6d
(cherry picked from commit 8d5dc506a776efc8fb01fc7cc43d2135ae861f57)
---
 .../base/core/res/res/xml/power_profile.xml      | 16 ++++++++--------
 .../base/core/res/res/xml/power_profile.xml      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index 68584f6..469ef39 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -173,15 +173,15 @@
     <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>
+    <item name="modem.controller.sleep">2.5</item>
+    <item name="modem.controller.idle">4.5</item>
+    <item name="modem.controller.rx">169</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>
+        <value>223</value>
+        <value>243</value>
+        <value>298</value>
+        <value>573</value>
+        <value>668</value>
     </array>
     <item name="modem.controller.voltage">3700</item>
 
diff --git a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
index f84c9bd..9bd7052 100644
--- a/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
+++ b/panther/overlay/frameworks/base/core/res/res/xml/power_profile.xml
@@ -173,15 +173,15 @@
     <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>
+    <item name="modem.controller.sleep">2.5</item>
+    <item name="modem.controller.idle">4.5</item>
+    <item name="modem.controller.rx">169</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>
+        <value>223</value>
+        <value>243</value>
+        <value>298</value>
+        <value>573</value>
+        <value>668</value>
     </array>
     <item name="modem.controller.voltage">3700</item>
 

From 5ab7e56d928863feba8178199388e3e6873d8f46 Mon Sep 17 00:00:00 2001
From: Chase Wu <chasewu@google.com>
Date: Thu, 23 Jun 2022 20:34:07 +0800
Subject: [PATCH 2/2] haptics: add actuator model

Bug: 236202962
Test: verified actuator model config propogated and handled properly by
vibrator HAL
Signed-off-by: Chase Wu <chasewu@google.com>
Change-Id: I2be634fdf51c369f69b49cfe99c0e9f717d81c90
---
 device-cheetah.mk | 5 ++++-
 device-panther.mk | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/device-cheetah.mk b/device-cheetah.mk
index 3bc8f53..719c576 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -296,8 +296,11 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
 # Vibrator HAL
+ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1
+    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.device.mass=0.214 \
+    ro.vendor.vibrator.hal.loc.coeff=2.7
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.firmware.selection=BCM.hcd
diff --git a/device-panther.mk b/device-panther.mk
index d3624cf..2435969 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -284,8 +284,11 @@ PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.udfps.lhbm_controlled_in_hal_supported=true
 
 # Vibrator HAL
+ACTUATOR_MODEL := luxshare_ict_081545
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.vibrator.hal.chirp.enabled=1
+    ro.vendor.vibrator.hal.chirp.enabled=1 \
+    ro.vendor.vibrator.hal.device.mass=0.195 \
+    ro.vendor.vibrator.hal.loc.coeff=2.65
 
 PRODUCT_PRODUCT_PROPERTIES += \
     persist.bluetooth.firmware.selection=BCM.hcd