From a0670ae6e7a35bc1b2418f872424d428c9e0d324 Mon Sep 17 00:00:00 2001
From: Zouberou Sayibou <zouberou@google.com>
Date: Tue, 3 Dec 2024 02:47:11 +0000
Subject: [PATCH 1/2] Revert "shusky/haptics: Remove voltage restriction for
 haptics"

Revert submission 30661505-tdm_amplitude_limitation_removal_dvl

Reason for revert: short time to properly test before 25q1 cut-off.

Reverted changes: /q/submissionid:30661505-tdm_amplitude_limitation_removal_dvl

Bug: 318476589

Change-Id: I7d0fc0f64aa41cd901797cfc4a81eb41e7de1c05
---
 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 insertions(+)

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 a543d1a..893d3ba 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -300,6 +300,9 @@
 
     <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 97d8b95..40dd9d6 100644
--- a/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/ripcurrent/overlay/frameworks/base/core/res/res/values/config.xml
@@ -231,4 +231,6 @@
           <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 b2a1a13..fcbbc46 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -294,6 +294,9 @@
 
     <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>

From fc98bc4ea67cb3f03b2680610894a154c48bcc49 Mon Sep 17 00:00:00 2001
From: David Li <dvdli@google.com>
Date: Thu, 5 Dec 2024 11:43:32 +0000
Subject: [PATCH 2/2] audio: align volume curve

Bug: 382270418
Test: n/a
Flag: EXEMPT bugfix
Change-Id: I396b61b57a07307285abeffa911fafdb04221e91
---
 .../aidl_config/audio_policy_volumes.xml      | 106 +++++++++++-------
 audio/shiba/aidl_config/mixer_paths_aidl.xml  |   2 +-
 2 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/audio/shiba/aidl_config/audio_policy_volumes.xml b/audio/shiba/aidl_config/audio_policy_volumes.xml
index 3fe738d..b087a21 100644
--- a/audio/shiba/aidl_config/audio_policy_volumes.xml
+++ b/audio/shiba/aidl_config/audio_policy_volumes.xml
@@ -51,8 +51,14 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                         ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4500</point>
+        <point>29,-3400</point>
+        <point>57,-2250</point>
+        <point>71,-1900</point>
+        <point>86,-1530</point>
+        <point>100,-1100</point>
+    </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -62,9 +68,12 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
+        <point>1,-4000</point>
+        <point>29,-2950</point>
+        <point>43,-2350</point>
+        <point>57,-1850</point>
+        <point>71,-1400</point>
+        <point>86,-700</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -76,31 +85,31 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6438</point>
-        <point>4,-6438</point>
-        <point>8,-5961</point>
-        <point>12,-5543</point>
-        <point>16,-5167</point>
-        <point>20,-4743</point>
-        <point>24,-4391</point>
-        <point>28,-4061</point>
-        <point>32,-3871</point>
-        <point>36,-3673</point>
-        <point>40,-3471</point>
-        <point>44,-3273</point>
-        <point>48,-3065</point>
-        <point>52,-2850</point>
-        <point>56,-2618</point>
-        <point>60,-2355</point>
-        <point>64,-2060</point>
-        <point>68,-1773</point>
-        <point>72,-1482</point>
-        <point>76,-1205</point>
-        <point>80,-989</point>
-        <point>84,-791</point>
-        <point>88,-578</point>
-        <point>92,-374</point>
-        <point>96,-137</point>
+        <point>1,-5927</point>
+        <point>4,-5927</point>
+        <point>8,-5574</point>
+        <point>12,-5281</point>
+        <point>16,-4952</point>
+        <point>20,-4562</point>
+        <point>24,-4213</point>
+        <point>28,-3838</point>
+        <point>32,-3600</point>
+        <point>36,-3385</point>
+        <point>40,-3116</point>
+        <point>44,-2927</point>
+        <point>48,-2665</point>
+        <point>52,-2436</point>
+        <point>56,-2181</point>
+        <point>60,-1985</point>
+        <point>64,-1743</point>
+        <point>68,-1553</point>
+        <point>72,-1427</point>
+        <point>76,-1166</point>
+        <point>80,-1045</point>
+        <point>84,-895</point>
+        <point>88,-644</point>
+        <point>92,-486</point>
+        <point>96,-209</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -112,9 +121,11 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
+        <point>0,-5600</point>
+        <point>29,-3520</point>
+        <point>57,-1500</point>
+        <point>71,-1150</point>
+        <point>86,-500</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -126,10 +137,11 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-2970</point>
-        <point>33,-2010</point>
-        <point>66,-1020</point>
-        <point>100,0</point>
+        <point>1,-4500</point>
+        <point>29,-3800</point>
+        <point>71,-1850</point>
+        <point>86,-1000</point>
+        <point>100,-500</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -165,8 +177,14 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4500</point>
+        <point>29,-3400</point>
+        <point>57,-2250</point>
+        <point>71,-1900</point>
+        <point>86,-1530</point>
+        <point>100,-1100</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -179,8 +197,14 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                       ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-5700</point>
+        <point>29,-4230</point>
+        <point>43,-3300</point>
+        <point>57,-3100</point>
+        <point>71,-2500</point>
+        <point>100,-1400</point>
+    </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml
index d970e8e..f42674f 100644
--- a/audio/shiba/aidl_config/mixer_paths_aidl.xml
+++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml
@@ -1480,7 +1480,7 @@
   <path name="adapted-voice-speaker">
     <ctl name="R Boost Peak Current Limit" value="3.50A" />
     <ctl name="Boost Peak Current Limit" value="3.50A" />
-    <ctl name="Digital PCM Volume" value="800" />
+    <ctl name="Digital PCM Volume" value="817" />
     <ctl name="R Digital PCM Volume" value="817" />
   </path>
   <path name="adapted-voice-speaker-battery-throttled">