Merge "Add a way to disable auto prefer fit for launch." into main
diff --git a/audio/akita/aidl_config/audio_policy_volumes.xml b/audio/akita/aidl_config/audio_policy_volumes.xml
index 8a138a0..7731b40 100644
--- a/audio/akita/aidl_config/audio_policy_volumes.xml
+++ b/audio/akita/aidl_config/audio_policy_volumes.xml
@@ -16,7 +16,7 @@
<!-- Volume section defines a volume curve for a given use case and device category.
It contains a list of points of this curve expressing the attenuation in Millibels for a given
volume index from 0 to 100.
-<volume stream=”AUDIO_STREAM_MUSIC” deviceCategory=””>
+<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="">
<point>0,-9600</point>
<point>100,0</point>
</volume>
@@ -52,13 +52,10 @@
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-5200</point>
- <point>13,-5000</point>
- <point>28,-4400</point>
- <point>56,-3380</point>
- <point>71,-3120</point>
- <point>85,-2750</point>
- <point>100,-2150</point>
+ <point>1,-5000</point>
+ <point>33,-3500</point>
+ <point>66,-2400</point>
+ <point>100,-1600</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -69,10 +66,9 @@
<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,-4935</point>
- <point>14,-3320</point>
- <point>28,-2960</point>
- <point>71,-1400</point>
+ <point>1,-4000</point>
+ <point>33,-2400</point>
+ <point>66,-1200</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -84,31 +80,30 @@
<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,-6920</point>
- <point>4,-6920</point>
- <point>8,-6664</point>
- <point>12,-6374</point>
- <point>16,-6082</point>
- <point>20,-5759</point>
- <point>24,-5410</point>
- <point>28,-5038</point>
- <point>32,-4807</point>
- <point>36,-4577</point>
- <point>40,-4339</point>
- <point>44,-4132</point>
- <point>48,-3860</point>
- <point>52,-3569</point>
- <point>56,-3223</point>
- <point>60,-2823</point>
- <point>64,-2452</point>
- <point>68,-2078</point>
- <point>72,-1795</point>
- <point>76,-1561</point>
- <point>80,-1226</point>
- <point>84,-956</point>
- <point>88,-789</point>
- <point>92,-635</point>
- <point>96,-505</point>
+ <point>1,-6589</point>
+ <point>8,-5971</point>
+ <point>12,-5619</point>
+ <point>16,-5212</point>
+ <point>20,-4833</point>
+ <point>24,-4434</point>
+ <point>28,-4141</point>
+ <point>32,-3856</point>
+ <point>36,-3611</point>
+ <point>40,-3382</point>
+ <point>44,-3143</point>
+ <point>48,-2921</point>
+ <point>52,-2695</point>
+ <point>56,-2497</point>
+ <point>60,-2308</point>
+ <point>64,-2109</point>
+ <point>68,-1893</point>
+ <point>72,-1706</point>
+ <point>76,-1474</point>
+ <point>80,-1224</point>
+ <point>84,-1000</point>
+ <point>88,-786</point>
+ <point>92,-581</point>
+ <point>96,-275</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -120,11 +115,10 @@
<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,-5600</point>
- <point>14,-4670</point>
- <point>28,-3060</point>
- <point>71,-1050</point>
- <point>100,-100</point>
+ <point>0,-4000</point>
+ <point>33,-2400</point>
+ <point>66,-1200</point>
+ <point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@@ -135,12 +129,10 @@
<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,-6350</point>
- <point>14,-4300</point>
- <point>28,-3710</point>
- <point>66,-2100</point>
- <point>85,-1550</point>
- <point>100,-780</point>
+ <point>1,-4800</point>
+ <point>33,-2400</point>
+ <point>66,-1200</point>
+ <point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -177,13 +169,10 @@
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-5200</point>
- <point>13,-5000</point>
- <point>28,-4400</point>
- <point>56,-3380</point>
- <point>71,-3120</point>
- <point>85,-2750</point>
- <point>100,-2150</point>
+ <point>1,-5000</point>
+ <point>33,-3500</point>
+ <point>66,-2400</point>
+ <point>100,-1600</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -198,12 +187,10 @@
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
- <point>1,-6600</point>
- <point>13,-6220</point>
- <point>28,-5500</point>
- <point>42,-4600</point>
- <point>57,-4250</point>
- <point>100,-2780</point>
+ <point>1,-6000</point>
+ <point>33,-3000</point>
+ <point>66,-2200</point>
+ <point>100,-1600</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/akita/aidl_config/mixer_paths_aidl.xml b/audio/akita/aidl_config/mixer_paths_aidl.xml
index 59cad52..55c04ce 100644
--- a/audio/akita/aidl_config/mixer_paths_aidl.xml
+++ b/audio/akita/aidl_config/mixer_paths_aidl.xml
@@ -1449,8 +1449,8 @@
<!-- Acoustic shock enabled: "adapted-speaker-acoustic-shock" -->
<!-- Both are enabled: "adapted-speaker-battery-throttled-acoustic-shock" -->
<path name="adapted-speaker">
- <ctl name="Boost Peak Current Limit" value="2.50A" />
- <ctl name="R Boost Peak Current Limit" value="2.50A" />
+ <ctl name="Boost Peak Current Limit" value="3.50A" />
+ <ctl name="R Boost Peak Current Limit" value="3.50A" />
<ctl name="Digital PCM Volume" value="817" />
<ctl name="R Digital PCM Volume" value="817" />
</path>
@@ -1479,7 +1479,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">
