Fix editable roaming mode query bugandroid-o-mr1-iot-release-1.0.1

We were querying whether or not the WFC mode was editable,
instead of the WFC roaming mode. This was causing the issue
where the user was unable to set WiFi preferred mode when
the WFC mode was not editable.

Bug: 80168790
Test: Manual
Change-Id: I8895ee97e7917192305e8ad53fd4de9ce1bfca01
Merged-In: I5f219cdab2bea5ac344252fc0fc5ee849a9fa937

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;