diff options
author | Brad Ebinger <breadley@google.com> | 2018-05-29 13:03:28 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-29 13:03:28 -0700 |
commit | 53b60f743d9106493058bac7bbc83f665f7502b5 (patch) | |
tree | 85e7015e236862b3747058678d1b781c0b038e95 | |
parent | 088011da2e9d2e12f9e9829f2e2e56a2cf00cfd6 (diff) | |
parent | df97867f425c58af459da176b0220354a3ee38a0 (diff) | |
download | ims-53b60f743d9106493058bac7bbc83f665f7502b5.tar.gz |
Fix editable roaming mode query bug
am: df97867f42
Change-Id: I5f219cdab2bea5ac344252fc0fc5ee849a9fa937
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 18 |
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 31fe0fb3..31dd86f4 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -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 { - 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; |