Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86320e54 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15dee 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828

Change-Id: I8cec53b0c426cf73c470db0d763280d13435b257
parents c855a8a2 6fe15dee

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+4 −12
Original line number Diff line number Diff line
@@ -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);

        }