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

Commit ba79bb6f authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Fix editable roaming mode query bug am: df97867f

am: 53b60f74

Change-Id: I8b26ed78562fbd19238ac7f7fdf8dab30546e654
parents 71316c8f 53b60f74
Loading
Loading
Loading
Loading
+7 −11
Original line number Diff line number Diff line
@@ -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;