diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index 86e910b..60f0be3 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -308,6 +308,7 @@
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <module libname="audio_sounddose_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml
index a9120dd..ac241e4 100644
--- a/audio/husky/config/audio_policy_configuration.xml
+++ b/audio/husky/config/audio_policy_configuration.xml
@@ -97,7 +97,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink"  maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
index d0dbd1e..7175981 100644
--- a/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -97,7 +97,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 5c5602c..0755fec 100644
--- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -90,7 +90,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
index 82b3017..bfd76a7 100644
--- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml
@@ -97,7 +97,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index 86e910b..60f0be3 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -308,6 +308,7 @@
         <module libname="audio_waves_aoc.so" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN-SPEAKER"/>
         <module libname="audio_cca_aoc.so" argu="UnsupportBands=48000 ExSharedBands=48000 VoIPMode=Dl"/>
         <module libname="audio_fortemedia_aoc.so" argu="MCPS_TABLE=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 SHARED_MODULE=1130578253"/>
+        <module libname="audio_sounddose_aoc.so"/>
         <module libname="liboffloadeffect.so"/>
         <module libname="audio_amcs_ext.so"/>
         <module libname="audio_bluenote_aoc.so"/>
diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml
index a9120dd..9c8f2f9 100644
--- a/audio/shiba/config/audio_policy_configuration.xml
+++ b/audio/shiba/config/audio_policy_configuration.xml
@@ -97,7 +97,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
index d0dbd1e..7175981 100644
--- a/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -97,7 +97,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 5c5602c..0755fec 100644
--- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -90,7 +90,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink" maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
index 82b3017..0f6f636 100644
--- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
+++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml
@@ -97,7 +97,7 @@
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
-                <mixPort name="incall capture" role="sink">
+                <mixPort name="incall capture" role="sink"  maxActiveCount="2" maxOpenCount="2">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="48000"
                              channelMasks="AUDIO_CHANNEL_IN_MONO"/>
diff --git a/device-husky.mk b/device-husky.mk
index 33aef1a..f4e2f00 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -125,6 +125,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_enabled=true
 
+# Sound Dose
+PRODUCT_PACKAGES += \
+	android.hardware.audio.sounddose-vendor-impl \
+	audio_sounddose_aoc
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
diff --git a/device-shiba.mk b/device-shiba.mk
index be73350..83147ac 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -113,6 +113,11 @@ PRODUCT_PACKAGES += \
 PRODUCT_PROPERTY_OVERRIDES += \
        ro.audio.spatializer_enabled=true
 
+# Sound Dose
+PRODUCT_PACKAGES += \
+	android.hardware.audio.sounddose-vendor-impl \
+	audio_sounddose_aoc
+
 # Audio CCA property
 PRODUCT_PROPERTY_OVERRIDES += \
 	persist.vendor.audio.cca.enabled=false
diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml
index f03519a..c37151b 100644
--- a/husky/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml
@@ -289,6 +289,8 @@
     <!-- MMS user agent profile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/G1MNW.xml</string>
 
+    <bool name="config_safe_sound_dosage_enabled">true</bool>
+
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
 
diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
index a83fa35..5128d0d 100644
--- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml
@@ -283,6 +283,8 @@
     <!-- MMS user agent profile url -->
     <string name="config_mms_user_agent_profile_url" translatable="false">http://www.gstatic.com/android/sms/GKWS6.xml</string>
 
+    <bool name="config_safe_sound_dosage_enabled">true</bool>
+
     <!-- The max vibration strength allowed in audio haptic channels. -->
     <item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
 
diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json
index 9e659ee..b08761a 100644
--- a/thermal/thermal_info_config_husky.json
+++ b/thermal/thermal_info_config_husky.json
@@ -582,21 +582,21 @@
                            "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
                            "MaxReleaseStep": 1,
                            "MaxThrottleStep": 1,
-                           "CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
+                           "CdevCeiling": [0, 2, 6, 6, 6, 6, 6]
                         },
                         {
                            "CdevRequest": "thermal-cpufreq-1",
                            "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
                            "MaxReleaseStep": 1,
                            "MaxThrottleStep": 2,
-                           "CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
+                           "CdevCeiling": [0, 6, 9, 9, 9, 9, 9]
                         },
                         {
                            "CdevRequest": "thermal-cpufreq-2",
                            "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
                            "MaxReleaseStep": 1,
                            "MaxThrottleStep": 2,
-                           "CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
+                           "CdevCeiling": [0, 8, 12, 12, 12, 12, 12]
                         }
                     ]
                 }
diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json
index 988dac3..bc6bdf1 100644
--- a/thermal/thermal_info_config_shiba.json
+++ b/thermal/thermal_info_config_shiba.json
@@ -550,21 +550,21 @@
                            "CdevWeightForPID": [0.156, 0.156, 0.156, 0.156, 0.156, 0.156, 0.156],
                            "MaxReleaseStep": 1,
                            "MaxThrottleStep": 1,
-                           "CdevCeiling": [0, 6, 6, 6, 6, 6, 6]
+                           "CdevCeiling": [0, 2, 6, 6, 6, 6, 6]
                         },
                         {
                            "CdevRequest": "thermal-cpufreq-1",
                            "CdevWeightForPID": [0.428, 0.428, 0.428, 0.428, 0.428, 0.428, 0.428],
                            "MaxReleaseStep": 1,
                            "MaxThrottleStep": 2,
-                           "CdevCeiling": [0, 9, 9, 9, 9, 9, 9]
+                           "CdevCeiling": [0, 6, 9, 9, 9, 9, 9]
                         },
                         {
                            "CdevRequest": "thermal-cpufreq-2",
                            "CdevWeightForPID": [0.225, 0.225, 0.225, 0.225, 0.225, 0.225, 0.225],
                            "MaxReleaseStep": 1,
                            "MaxThrottleStep": 2,
-                           "CdevCeiling": [0, 12, 12, 12, 12, 12, 12]
+                           "CdevCeiling": [0, 8, 12, 12, 12, 12, 12]
                         }
                     ]
                 }