From 91412b50697195093bec77f1b8a6dd3a67e3da3a Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Mon, 10 Feb 2020 00:41:37 +0800 Subject: [PATCH] [Settings] Code refactor for Wifi calling IMS API Replacing logics of ImsManager#isWfcEnabledByPlatform() & MobileNetworkUtils#isWfcProvisionedOnDevice() into WifiCallingQueryImsState#isWifiCallingProvisioned(). Bug: 140542283 Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest Merged-In: I68462368669b81e10d09bbb93e74e23ea9a1f446 Change-Id: I26d616f082a4dd3f2cb14defc5f68218f668ad48 --- .../network/telephony/MobileNetworkUtils.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 11ea6c6a6cf..282b5318364 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -70,6 +70,7 @@ import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; +import com.android.settings.network.ims.WifiCallingQueryImsState; import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.graph.SignalDrawable; @@ -80,15 +81,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.CDMA; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.EVDO; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.GSM; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.LTE; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.NR; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_TD_SCDMA; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_UNKNOWN; -import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.WCDMA; - public class MobileNetworkUtils { private static final String TAG = "MobileNetworkUtils"; @@ -171,10 +163,10 @@ public class MobileNetworkUtils { isWifiCallingEnabled = intent != null; } else { + final WifiCallingQueryImsState queryState = + new WifiCallingQueryImsState(context, subId); final ImsManager imsMgr = ImsManager.getInstance(context, phoneId); - isWifiCallingEnabled = imsMgr != null - && imsMgr.isWfcEnabledByPlatform() - && isWfcProvisionedOnDevice(subId) + isWifiCallingEnabled = queryState.isWifiCallingProvisioned() && isImsServiceStateReady(imsMgr); }