diff options
| author | 2023-03-17 23:04:23 +0000 | |
|---|---|---|
| committer | 2023-03-17 23:04:23 +0000 | |
| commit | 6b0bb05b69af579d30da2bd6f4de1d5cb9bcb734 (patch) | |
| tree | 0c33c8d3f933d99b7a1c8e85b097a3a8b94ad8ae | |
| parent | 9572b125885789286760862eba9c3fe0c03c4711 (diff) | |
| parent | 71e0efd932b3319eaaa001a42d3afa57a699054a (diff) | |
Merge "CSD: enable sound dose in AudioService" into udc-dev
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/audio/SoundDoseHelper.java | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 220a1935f51a..a8da4c86b1dd 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2078,7 +2078,7 @@ <integer name="config_audio_ring_vol_default">5</integer> <!-- Enable sound dose computation and warnings --> - <bool name="config_audio_csd_enabled_default">false</bool> + <bool name="config_audio_csd_enabled_default">true</bool> <!-- The default value for whether head tracking for spatial audio is enabled for a newly connected audio device --> diff --git a/services/core/java/com/android/server/audio/SoundDoseHelper.java b/services/core/java/com/android/server/audio/SoundDoseHelper.java index d6a9d3aa8ce3..bb49a182d866 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; } |