Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CSD: Set the default csd property to false" into udc-dev

Browse Source
This commit is contained in:
Vlad Popa
2023-05-10 08:36:48 +00:00
committed by Android (Google) Code Review
parent 818f31832a 75213957cf
commit 192db65ef3
8 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values-mcc310/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

3
core/res/res/values-mcc311/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

3
core/res/res/values-mcc312/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

3
core/res/res/values-mcc313/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

3
core/res/res/values-mcc314/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

3
core/res/res/values-mcc315/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

3
core/res/res/values-mcc316/config.xml
View File

@@ -22,7 +22,4 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">false</bool> <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> </resources>

9
core/res/res/values/config.xml
View File

@@ -2957,8 +2957,13 @@
<!-- Whether safe headphone volume is enabled or not (country specific). --> <!-- Whether safe headphone volume is enabled or not (country specific). -->
<bool name="config_safe_media_volume_enabled">true</bool> <bool name="config_safe_media_volume_enabled">true</bool>
<!-- Whether safe headphone sound dosage warning is enabled or not (country specific). --> <!-- Whether safe headphone sound dosage warning is enabled or not
<bool name="config_safe_sound_dosage_enabled">true</bool> (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). --> <!-- Whether safe headphone volume warning dialog is disabled on Vol+ (operator specific). -->
<bool name="config_safe_media_disable_on_volume_up">true</bool> <bool name="config_safe_media_disable_on_volume_up">true</bool>