From 2bead080500e8b79e7cf7267f01697a708bf2f87 Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Tue, 1 Jul 2025 23:48:51 +0100
Subject: [PATCH] salami: audio: Import OEM edits

Change-Id: I52d0d2bb5e84a66e84ec8fd99d0589e81c5034bb
---
 configs/audio/audio_policy_volumes.xml  | 236 ++++++++++++++++++++++--
 configs/audio/default_volume_tables.xml | 106 +++++++++++
 2 files changed, 324 insertions(+), 18 deletions(-)

diff --git a/configs/audio/audio_policy_volumes.xml b/configs/audio/audio_policy_volumes.xml
index 1dec6f4..c20cb18 100644
--- a/configs/audio/audio_policy_volumes.xml
+++ b/configs/audio/audio_policy_volumes.xml
@@ -23,34 +23,83 @@ volume index from 0 to 100.
 -->
 
 <volumes>
+    <!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>0,-4200</point>
         <point>33,-2800</point>
         <point>66,-1400</point>
         <point>100,0</point>
     </volume>
-    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-2400</point>
-        <point>33,-1600</point>
-        <point>66,-800</point>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>0,-3900</point>
+        <point>33,-2400</point>
+        <point>66,-1100</point>
         <point>100,0</point>
     </volume>
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_A2DP">
+        <point>0,-4800</point>
+        <point>33,-3200</point>
+        <point>66,-1600</point>
+        <point>100,0</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+        <point>0,-3900</point>
+        <point>33,-2400</point>
+        <point>66,-1100</point>
+        <point>100,0</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>0,-3300</point>
+        <point>33,-2200</point>
+        <point>66,-1100</point>
+        <point>100,0</point>
+    </volume>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
         <point>0,-2400</point>
         <point>33,-1600</point>
         <point>66,-800</point>
         <point>100,0</point>
     </volume>
+	#else OPLUS_BUG_STABILITY -->
+     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE">
+        <point>0,-3700</point>
+        <point>33,-1800</point>
+        <point>66,-900</point>
+        <point>100,0</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                              ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                             ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
+                                             ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>1,-3000</point>
         <point>33,-2600</point>
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
+	<!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_A2DP">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -61,12 +110,27 @@ volume index from 0 to 100.
                                          ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <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">
+    <!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
+	<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-2970</point>
         <point>33,-2010</point>
         <point>66,-1020</point>
         <point>100,0</point>
     </volume>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4000</point>
+        <point>33,-2910</point>
+        <point>66,-1620</point>
+        <point>100,-300</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                       ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -75,6 +139,14 @@ volume index from 0 to 100.
                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                        ref="DEFAULT_MEDIA_VOLUME_CURVE_A2DP"/>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                       ref="DEFAULT_MEDIA_VOLUME_CURVE_USB_HEADSET"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                         ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -85,12 +157,27 @@ volume index from 0 to 100.
                                         ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <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">
+	<!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
+	<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>0,-2970</point>
         <point>33,-2010</point>
         <point>66,-1020</point>
         <point>100,0</point>
     </volume>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+	<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4000</point>
+        <point>33,-2910</point>
+        <point>66,-1620</point>
+        <point>100,-300</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                       ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -99,36 +186,68 @@ volume index from 0 to 100.
                                         ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
     <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">
+	<!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
+	<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>
     </volume>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4300</point>
+        <point>33,-3210</point>
+        <point>66,-1920</point>
+        <point>100,-600</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                               ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                                ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>0,-4200</point>
         <point>33,-2800</point>
         <point>66,-1400</point>
         <point>100,0</point>
     </volume>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET"
+                                                ref="DEFAULT_VOICE_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                                ref="DEFAULT_VOICE_VOLUME_CURVE"/>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                                ref="DEFAULT_VOICE_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>0,-2400</point>
         <point>33,-1600</point>
         <point>66,-800</point>
         <point>100,0</point>
     </volume>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE">
         <point>0,-4200</point>
         <point>33,-2800</point>
         <point>66,-1400</point>
         <point>100,0</point>
     </volume>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE"
+                                                ref="DEFAULT_VOICE_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
                                                 ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
@@ -139,22 +258,81 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
+	<!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_A2DP">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+        <point>1,-3000</point>
+        <point>33,-2600</point>
+        <point>66,-2200</point>
+        <point>100,-1800</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
+	<!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,Modify for JP version shutter sound
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+	#else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-3500</point>
+        <point>33,-3100</point>
+        <point>66,-2700</point>
+        <point>100,-2400</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <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"
                                                    ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
                                                    ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
+    <!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
         <point>1,-3000</point>
         <point>33,-2600</point>
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
+    #else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET">
+        <point>1,-5100</point>
+        <point>33,-4500</point>
+        <point>66,-4100</point>
+        <point>100,-3700</point>
+    </volume>
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_A2DP">
+        <point>1,-3600</point>
+        <point>33,-3200</point>
+        <point>66,-2800</point>
+        <point>100,-2400</point>
+    </volume>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_USB_HEADSET">
+        <point>1,-5100</point>
+        <point>33,-4500</point>
+        <point>66,-4100</point>
+        <point>100,-3700</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
+    <!-- #ifdef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,change DTMF speaker
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    #else OPLUS_BUG_STABILITY -->
+    <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-3300</point>
+        <point>33,-3000</point>
+        <point>66,-2700</point>
+        <point>100,-2400</point>
+    </volume>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -163,6 +341,14 @@ volume index from 0 to 100.
                                        ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                       ref="SILENT_VOLUME_CURVE"/>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                      ref="SILENT_VOLUME_CURVE"/>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                      ref="SILENT_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                       ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -173,6 +359,14 @@ volume index from 0 to 100.
                                       ref="SILENT_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                 ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2018/10/12,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                                ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                                 ref="DEFAULT_NON_MUTABLE_SPEAKER_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -181,18 +375,16 @@ volume index from 0 to 100.
                                                 ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
                                                 ref="DEFAULT_NON_MUTABLE_HEARING_AID_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEADSET"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EARPIECE"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
-                                                ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
-    <volume stream="AUDIO_STREAM_ASSISTANT" deviceCategory="DEVICE_CATEGORY_HEARING_AID"
-                                                ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                             ref="FULL_SCALE_VOLUME_CURVE"/>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                            ref="FULL_SCALE_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                             ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -203,6 +395,14 @@ volume index from 0 to 100.
                                             ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="FULL_SCALE_VOLUME_CURVE"/>
+	<!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,modify for voip and a2dp volume -->
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_A2DP"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
+    <!-- Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_USB_HEADSET"
+                                        ref="FULL_SCALE_VOLUME_CURVE"/>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER"
                                         ref="FULL_SCALE_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE"
diff --git a/configs/audio/default_volume_tables.xml b/configs/audio/default_volume_tables.xml
index 207be41..4a38bef 100644
--- a/configs/audio/default_volume_tables.xml
+++ b/configs/audio/default_volume_tables.xml
@@ -25,6 +25,16 @@
         <point>0,-9600</point>
         <point>100,-9600</point>
     </reference>
+    <!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@MM.AudioServer.Policy, 2019/08/21,Add for voice volume -->
+    <reference name="DEFAULT_VOICE_VOLUME_CURVE">
+    <!-- Default Voice reference Volume Curve -->
+        <point>0,-4200</point>
+        <point>33,-2800</point>
+        <point>66,-1400</point>
+        <point>100,0</point>
+    </reference>
+    <!-- #endif OPLUS_BUG_STABILITY -->
     <reference name="DEFAULT_SYSTEM_VOLUME_CURVE">
     <!-- Default System reference Volume Curve -->
         <point>1,-2400</point>
@@ -34,10 +44,84 @@
     </reference>
     <reference name="DEFAULT_MEDIA_VOLUME_CURVE">
     <!-- Default Media reference Volume Curve -->
+    <!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@PSW.MM.AudioServer.Policy, 2019/08/21
+    //Modify for headset music min and default volume
         <point>1,-5800</point>
         <point>20,-4000</point>
         <point>60,-1700</point>
         <point>100,0</point>
+    #else /* OPLUS_BUG_STABILITY */ -->
+        <point>1,-7000</point>
+        <point>10,-6100</point>
+        <point>20,-5500</point>
+        <point>30,-4900</point>
+        <point>40,-4400</point>
+        <point>50,-3800</point>
+        <point>60,-3200</point>
+        <point>70,-2860</point>
+        <point>80,-2560</point>
+        <point>90,-2260</point>
+        <point>100,-1960</point>
+        <point>110,-1650</point>
+        <point>120,-1350</point>
+        <point>130,-1000</point>
+        <point>140,-700</point>
+        <point>150,-350</point>
+        <point>160,-20</point>
+    <!-- #endif /* OPLUS_BUG_STABILITY */ -->
+    </reference>
+    <!-- #ifdef OPLUS_BUG_STABILITY
+    //Qinhui.Gu@PSW.MM.AudioServer.Policy, 2019/12/11, add USB_HEADSET device category for tuning separately -->
+    <reference name="DEFAULT_MEDIA_VOLUME_CURVE_USB_HEADSET">
+    <!-- USB_HEADSET Media reference Volume Curve -->
+        <point>1,-7000</point>
+        <point>10,-6250</point>
+        <point>20,-5650</point>
+        <point>30,-5150</point>
+        <point>40,-4650</point>
+        <point>50,-4100</point>
+        <point>60,-3500</point>
+        <point>70,-3150</point>
+        <point>80,-2850</point>
+        <point>90,-2550</point>
+        <point>100,-2250</point>
+        <point>110,-1950</point>
+        <point>120,-1650</point>
+        <point>130,-1300</point>
+        <point>140,-950</point>
+        <point>150,-600</point>
+        <point>160,-250</point>
+    </reference>
+    <!-- #endif /* OPLUS_BUG_STABILITY */ -->
+    <reference name="DEFAULT_MEDIA_VOLUME_CURVE_A2DP">
+    <!-- Default Media reference Volume Curve -->
+    <!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@PSW.MM.AudioServer.Policy, 2019/08/21,
+    // Modify for bluetooth headset music min and default volume
+        <point>1,-5800</point>
+        <point>20,-4000</point>
+        <point>60,-1700</point>
+        <point>100,0</point>
+    #else /* OPLUS_BUG_STABILITY */ -->
+        <point>1,-7000</point>
+        <point>10,-5200</point>
+        <point>20,-4800</point>
+        <point>30,-4500</point>
+        <point>40,-4200</point>
+        <point>50,-3900</point>
+        <point>60,-3600</point>
+        <point>70,-3300</point>
+        <point>80,-3000</point>
+        <point>90,-2700</point>
+        <point>100,-2300</point>
+        <point>110,-2000</point>
+        <point>120,-1600</point>
+        <point>130,-1200</point>
+        <point>140,-900</point>
+        <point>150,-600</point>
+        <point>160,-380</point>
+    <!-- #endif /* OPLUS_BUG_STABILITY */ -->
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE">
     <!--Default Volume Curve -->
@@ -48,10 +132,32 @@
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE">
     <!-- Default is Speaker Media Volume Curve -->
+    <!-- #ifndef OPLUS_BUG_STABILITY
+    //YaJun.Li@PSW.MM.AudioServer.Policy, 2019/08/21
+    //Modify for speaker music default volume for 19065
         <point>1,-5800</point>
         <point>20,-4000</point>
         <point>60,-1700</point>
         <point>100,0</point>
+    #else /* OPLUS_BUG_STABILITY */ -->
+        <point>1,-6000</point>
+        <point>10,-5500</point>
+        <point>20,-4500</point>
+        <point>30,-3950</point>
+        <point>40,-3400</point>
+        <point>50,-3000</point>
+        <point>60,-2600</point>
+        <point>70,-2300</point>
+        <point>80,-2050</point>
+        <point>90,-1880</point>
+        <point>100,-1680</point>
+        <point>110,-1290</point>
+        <point>120,-970</point>
+        <point>130,-750</point>
+        <point>140,-540</point>
+        <point>150,-150</point>
+        <point>160,0</point>
+    <!-- #endif /* OPLUS_BUG_STABILITY */ -->
     </reference>
     <reference name="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE">
     <!--Default Volume Curve -->