Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4063cae7 authored by Vlad Popa's avatar Vlad Popa Committed by Automerger Merge Worker
Browse files

Merge "CSD: Set the default csd property to false" into udc-dev am: 192db65e... 

Merge "CSD: Set the default csd property to false" into udc-dev am: 192db65e am: e92d0d9d am: 77a2e0bb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23102045



Change-Id: I94e3fdee5130bf19d4dd9ec45e0163618b42b004
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a00eec47 77a2e0bb

core/res/res/values-mcc310/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

core/res/res/values-mcc311/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

core/res/res/values-mcc312/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

core/res/res/values-mcc313/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>

core/res/res/values-mcc314/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -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>