Fix issue that Wifi Calling preference is showing wrong value.
When showing current Wifi Calling setting, we should decide
whether it's roaming based on telephony.isnetworkRoaming() instead
of checking the roaming button in setting page.
Bug: 67442943
Test: manual
Change-Id: I617cd4709a94ca888318e4903b0cdd2b00f3d84e
Merged-In: I617cd4709a94ca888318e4903b0cdd2b00f3d84e
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 0cd3c05..0f3ea2f 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -49,13 +49,13 @@
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
-import android.telephony.ims.feature.ImsFeature;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.euicc.EuiccManager;
+import android.telephony.ims.feature.ImsFeature;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
@@ -76,7 +76,6 @@
import com.android.phone.settings.PhoneAccountSettingsFragment;
import com.android.settingslib.RestrictedLockUtils;
-
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -1619,7 +1618,7 @@
} else {
int resId = com.android.internal.R.string.wifi_calling_off_summary;
if (ImsManager.isWfcEnabledByUser(mPhone.getContext())) {
- boolean isRoaming = mButtonDataRoam.isChecked();
+ boolean isRoaming = mTelephonyManager.isNetworkRoaming();
int wfcMode = ImsManager.getWfcMode(mPhone.getContext(), isRoaming);
switch (wfcMode) {
case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY: