Snap for 4810559 from df97867f425c58af459da176b0220354a3ee38a0 to pi-release
Change-Id: I301d601abd2f6b8a9fd853d676e0018f6eb527cc
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 7b22beb..590ab5a 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -995,17 +995,13 @@
}
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 {
- setting = getSettingFromSubscriptionManager(
- SubscriptionManager.WFC_IMS_ROAMING_MODE,
- CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT);
- }
+ // 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;