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

Commit c4956dd3 authored by Hiroto Tarui's avatar Hiroto Tarui Committed by android-build-merger
Browse files

Return the WFC roaming mode according to CarrierConfig value

am: d94a0e3d

Change-Id: I7c293fe09ce719880e299459900eb14d911cc789
parents fa9f5de3 d94a0e3d
Loading
Loading
Loading
Loading
+12 −7
Original line number Diff line number Diff line
@@ -1084,13 +1084,18 @@ public class ImsManager {
            }
            if (DBG) log("getWfcMode - setting=" + setting);
        } 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.
            if (getBooleanCarrierConfig(
                    CarrierConfigManager.KEY_USE_WFC_HOME_NETWORK_MODE_IN_ROAMING_NETWORK_BOOL)) {
                setting = getWfcMode(false);
            } else if (!getBooleanCarrierConfig(
                    CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL)) {
                setting = getIntCarrierConfig(
                        CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT);
            } else {
                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;