otter: overlay: Don't let any carrier default WFC mode to `IMS Preferred`
Qualcomm has added another WFC preference setting `IMS Preferred`
which is not supported in AOSP. If we let carriers default to this
setting, the AOSP settings app shows that WFC is disabled and
`Unexpected WFC mode value: 10` is logged. Even though the default
mode is still working fine, the user is unable to change to this
mode again once a different mode was selected. To fix this, remove
all default WFC mode settings with value "10" and let these carriers
default to "2" (`WiFi Preferred`, the default in AOSP) instead.
Leave the `carrier_wfc_supports_ims_preferred_bool` configs in place,
such that, in case the following patches are present in the system,
the user is still able to select the `IMS Preferred` mode in settings
manually.
https://git.codelinaro.org/clo/la/platform/frameworks/base/-/commit/097dacd55bf88a0baff805e5d21bc52aafca1b1e
https://git.codelinaro.org/clo/la/platform/packages/services/Telephony/-/commit/a451b1fd2305622a79ed42bf23627cb47b1e3c08
https://git.codelinaro.org/clo/la/platform/packages/apps/Settings/-/commit/a79d737742902e730090222589ecf4c19fa1b024
https://git.codelinaro.org/clo/la/platform/packages/apps/Settings/-/commit/d8ff55888f59f6340dc7a14f9ab44bb2a9d17fce#
https://git.codelinaro.org/clo/la/platform/packages/apps/Settings/-/commit/a2beaccd8fb78baf49da3ed0948b6cca45b5bd17
Change-Id: Ie6b9f30da45450c43a465de1170ef11d1d4ba1ee
diff --git a/overlay/CarrierConfigResCommon/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
index 6dcc6fd..d3b3930 100644
--- a/overlay/CarrierConfigResCommon/res/xml/vendor.xml
+++ b/overlay/CarrierConfigResCommon/res/xml/vendor.xml
@@ -117,8 +117,6 @@
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
<boolean name="force_home_network_bool" value="true" />
</carrier_config>
<carrier_config mcc="204" mnc="20">
@@ -212,10 +210,8 @@
<boolean name="carrier_volte_available_bool" value="true" />
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="editable_wfc_mode_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
</carrier_config>
<carrier_config mcc="222" mnc="01">
<boolean name="carrier_volte_available_bool" value="true" />
@@ -235,8 +231,6 @@
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
<boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
<boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
</carrier_config>
<carrier_config mcc="222" mnc="99">
<boolean name="carrier_volte_available_bool" value="true" />
@@ -246,8 +240,6 @@
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
<boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
<boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
</carrier_config>
<carrier_config mcc="226" mnc="10">
<boolean name="carrier_volte_available_bool" value="true" />
@@ -273,7 +265,6 @@
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
<int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
<boolean name="force_home_network_bool" value="true" />
@@ -299,8 +290,6 @@
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
<boolean name="carrier_default_wfc_ims_roaming_enabled_bool" value="true" />
<boolean name="carrier_default_wfc_ims_enabled_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
</carrier_config>
<carrier_config mcc="231" mnc="05">
<boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
@@ -517,7 +506,6 @@
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
<int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
<boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
@@ -528,7 +516,6 @@
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
<int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
<boolean name="fallback_sms_not_allowed_in_roaming" value="true" />
@@ -543,8 +530,6 @@
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
<boolean name="allow_hold_call_during_emergency_bool" value="false" />
</carrier_config>
<carrier_config mcc="262" mnc="02">
@@ -569,9 +554,7 @@
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
</carrier_config>
<carrier_config mcc="262" mnc="07">
<boolean name="carrier_volte_available_bool" value="true" />
@@ -602,9 +585,7 @@
<boolean name="carrier_wfc_ims_available_bool" value="true" />
<boolean name="editable_wfc_mode_bool" value="true" />
<boolean name="carrier_wfc_supports_ims_preferred_bool" value="true" />
- <int name="carrier_default_wfc_ims_mode_int" value="10" />
<boolean name="editable_wfc_roaming_mode_bool" value="true" />
- <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
</carrier_config>
<carrier_config mcc="268" mnc="01">
<boolean name="carrier_volte_available_bool" value="true" />