summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/res/res/values-mcc310/config.xml3
-rw-r--r--core/res/res/values-mcc311/config.xml3
-rw-r--r--core/res/res/values-mcc312/config.xml3
-rw-r--r--core/res/res/values-mcc313/config.xml3
-rw-r--r--core/res/res/values-mcc314/config.xml3
-rw-r--r--core/res/res/values-mcc315/config.xml3
-rw-r--r--core/res/res/values-mcc316/config.xml3
-rw-r--r--core/res/res/values/config.xml9
8 files changed, 7 insertions, 23 deletions
diff --git a/core/res/res/values-mcc310/config.xml b/core/res/res/values-mcc310/config.xml
index 76abceeb74b1..df398f9aab32 100644
--- a/core/res/res/values-mcc310/config.xml
+++ b/core/res/res/values-mcc310/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_mcc_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values-mcc311/config.xml b/core/res/res/values-mcc311/config.xml
index 6e0b678f94d9..df398f9aab32 100644
--- a/core/res/res/values-mcc311/config.xml
+++ b/core/res/res/values-mcc311/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values-mcc312/config.xml b/core/res/res/values-mcc312/config.xml
index 6e0b678f94d9..df398f9aab32 100644
--- a/core/res/res/values-mcc312/config.xml
+++ b/core/res/res/values-mcc312/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values-mcc313/config.xml b/core/res/res/values-mcc313/config.xml
index 6e0b678f94d9..df398f9aab32 100644
--- a/core/res/res/values-mcc313/config.xml
+++ b/core/res/res/values-mcc313/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values-mcc314/config.xml b/core/res/res/values-mcc314/config.xml
index 6e0b678f94d9..df398f9aab32 100644
--- a/core/res/res/values-mcc314/config.xml
+++ b/core/res/res/values-mcc314/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values-mcc315/config.xml b/core/res/res/values-mcc315/config.xml
index 6e0b678f94d9..df398f9aab32 100644
--- a/core/res/res/values-mcc315/config.xml
+++ b/core/res/res/values-mcc315/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values-mcc316/config.xml b/core/res/res/values-mcc316/config.xml
index 6e0b678f94d9..df398f9aab32 100644
--- a/core/res/res/values-mcc316/config.xml
+++ b/core/res/res/values-mcc316/config.xml
@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">false</bool>
-
</resources>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 984e2cae68dc..c147daf58e95 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -2957,8 +2957,13 @@
<!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">true</bool>
- <!-- Whether safe headphone sound dosage warning is enabled or not (country specific). -->
- <bool name="config_safe_sound_dosage_enabled">true</bool>
+ <!-- Whether safe headphone sound dosage warning is enabled or not
+ (country specific). This value should only be overlaid to true
+ when a vendor supports offload and has the HAL sound dose
+ interfaces implemented. Otherwise, this can lead to a compliance
+ issue with the safe hearing standards EN50332-3 and IEC62368-1.
+ -->
+ <bool name="config_safe_sound_dosage_enabled">false</bool>
<!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->
<bool name="config_safe_media_disable_on_volume_up">true</bool>