diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 220a1935f51a9..a8da4c86b1dde 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2078,7 +2078,7 @@
5
- false
+ true
diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java
index d6a9d3aa8ce3a..bb49a182d8660 100644
--- a/services/core/java/com/android/server/audio/SoundDoseHelper.java
+++ b/services/core/java/com/android/server/audio/SoundDoseHelper.java
@@ -732,6 +732,16 @@ public class SoundDoseHelper {
private void initCsd() {
if (!mEnableCsd) {
+ final ISoundDose soundDose = AudioSystem.getSoundDoseInterface(mSoundDoseCallback);
+ if (soundDose == null) {
+ Log.w(TAG, "ISoundDose instance is null.");
+ return;
+ }
+ try {
+ soundDose.disableCsd();
+ } catch (RemoteException e) {
+ Log.e(TAG, "Cannot disable CSD", e);
+ }
return;
}