commit ecfdff5e8cc29884656eabbe3ec1e6b6b4f031da
author android-build-team Robot <android-build-team-robot@google.com> Fri Nov 20 05:12:47 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Nov 20 05:12:47 2020 +0000
tree 7b49107a8fa7754e61435dcb4831ac17451fd00f
parent b019a6dedeeb3b05c5ee4cb3072d63a72ee389c3
parent 03e76e0167f192f36142c86d5c246a84a0fd3f55

Merge cherrypicks of [13096720, 13097192, 13097193] into rvc-qpr1-d-release

Change-Id: Ib826fc238085aea78db8022da4b83a76790f0e63

audio_policy_volumes.xml

diff --git a/audio_policy_volumes.xml b/audio_policy_volumes.xml
index 8720ecf..c2e0391 100644
--- a/audio_policy_volumes.xml
+++ b/audio_policy_volumes.xml
@@ -51,8 +51,16 @@
         <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,-7000</point>
+        <point>14,-5000</point>
+        <point>29,-4300</point>
+        <point>43,-3700</point>
+        <point>57,-3500</point>
+        <point>71,-3300</point>
+        <point>86,-3100</point>
+        <point>100,-2200</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"
@@ -161,8 +169,16 @@
         <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,-7000</point>
+        <point>14,-3700</point>
+        <point>29,-3240</point>
+        <point>43,-3150</point>
+        <point>57,-2920</point>
+        <point>71,-2700</point>
+        <point>86,-2540</point>
+        <point>100,-1850</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"