浏览代码

sm8450-common: 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

Additionally, enable the WFC mode settings for the affected carriers
which didn't enable them before such that the user can still prefer
cellular calls over vowifi without disabling vowifi completely.

Change-Id: Ie6b9f30da45450c43a465de1170ef11d1d4ba1ee
Arian 7 月之前
父节点
当前提交
4877097d3f
共有 1 个文件被更改,包括 2 次插入18 次删除
  1. 2 18
      overlay/CarrierConfigResCommon/res/xml/vendor.xml

+ 2 - 18
overlay/CarrierConfigResCommon/res/xml/vendor.xml

@@ -115,8 +115,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">
@@ -210,10 +208,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" />
@@ -249,7 +245,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="false" />
         <int name="carrier_default_wfc_ims_roaming_mode_int" value="1" />
         <boolean name="force_home_network_bool" value="true" />
@@ -482,7 +477,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_vowifi_roaming" value="true" />
@@ -493,7 +487,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_vowifi_roaming" value="true" />
@@ -505,11 +498,8 @@
     <carrier_config mcc="262" mnc="01">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
-        <boolean name="editable_wfc_roaming_mode_bool" value="false" />
+        <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">
@@ -532,11 +522,8 @@
     <carrier_config mcc="262" mnc="06">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <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="false" />
-        <int name="carrier_default_wfc_ims_roaming_mode_int" value="10" />
+        <boolean name="editable_wfc_roaming_mode_bool" value="true" />
     </carrier_config>
     <carrier_config mcc="262" mnc="07">
         <boolean name="carrier_volte_available_bool" value="true" />
@@ -565,11 +552,8 @@
     <carrier_config mcc="262" mnc="98">
         <boolean name="carrier_volte_available_bool" value="true" />
         <boolean name="carrier_wfc_ims_available_bool" value="true" />
-        <boolean name="editable_wfc_mode_bool" value="false" />
         <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" />