Fix editable roaming mode query bug

am: d0423bf708

Change-Id: I066c89d126af5015bc9b5245affcc87bdd7706b6

1 files changed, 7 insertions, 11 deletions

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 6869d558..52d523b9 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -994,17 +994,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 {
-                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;