Loading src/java/com/android/ims/ImsManager.java +7 −11 Original line number Diff line number Diff line Loading @@ -996,17 +996,13 @@ public class ImsManager { } if (DBG) log("getWfcMode - setting=" + setting); } else { // The WFC roaming mode is not editable, return the default setting in the // CarrierConfig, not the user set value. if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL)) { setting = getIntCarrierConfig( CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT); } else { // The WFC roaming mode is set in the Settings UI to be the same as the WFC mode if the // roaming mode is set to not "editable" (see // CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL for explanation), so can't // override those settings here by setting the WFC roaming mode to default, like above. setting = getSettingFromSubscriptionManager( SubscriptionManager.WFC_IMS_ROAMING_MODE, CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT); } if (DBG) log("getWfcMode (roaming) - setting=" + setting); } return setting; Loading Loading
src/java/com/android/ims/ImsManager.java +7 −11 Original line number Diff line number Diff line Loading @@ -996,17 +996,13 @@ public class ImsManager { } if (DBG) log("getWfcMode - setting=" + setting); } else { // The WFC roaming mode is not editable, return the default setting in the // CarrierConfig, not the user set value. if (!getBooleanCarrierConfig(CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL)) { setting = getIntCarrierConfig( CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT); } else { // The WFC roaming mode is set in the Settings UI to be the same as the WFC mode if the // roaming mode is set to not "editable" (see // CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL for explanation), so can't // override those settings here by setting the WFC roaming mode to default, like above. setting = getSettingFromSubscriptionManager( SubscriptionManager.WFC_IMS_ROAMING_MODE, CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT); } if (DBG) log("getWfcMode (roaming) - setting=" + setting); } return setting; Loading