Skip to content

Commit

Permalink
garnet: overlay: Don't let any carrier default WFC mode to IMS Preferred
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@ArianK16a @kleidione
ArianK16a authored and kleidione committed Jan 22, 2025
1 parent 7b51868 commit 5c56b70
Showing 1 changed file with 2 additions and 18 deletions.
20 changes: 2 additions & 18 deletions overlay/CarrierConfigOverlayGarnet/res/xml/vendor.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,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">
Expand Down Expand Up @@ -213,10 +211,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" />
Expand Down Expand Up @@ -252,7 +248,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" />
Expand Down Expand Up @@ -485,7 +480,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" />
Expand All @@ -496,7 +490,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" />
Expand All @@ -508,11 +501,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">
Expand All @@ -535,11 +525,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" />
Expand Down Expand Up @@ -568,11 +555,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" />
Expand Down

0 comments on commit 5c56b70

Please sign in to comment.