PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Code refactor for Wifi calling IMS API"

Browse Source
This commit is contained in:
Bonian Chen
2020-08-12 08:41:29 +00:00
committed by Gerrit Code Review
parent 5a19cea4ef 91412b5069
commit 6fe15deeb1
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -70,6 +70,7 @@ import com.android.internal.util.ArrayUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.network.ims.WifiCallingQueryImsState;
import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants; import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.settingslib.development.DevelopmentSettingsEnabler;
import com.android.settingslib.graph.SignalDrawable; import com.android.settingslib.graph.SignalDrawable;
@@ -80,15 +81,6 @@ import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future; 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 { public class MobileNetworkUtils {
private static final String TAG = "MobileNetworkUtils"; private static final String TAG = "MobileNetworkUtils";
@@ -171,10 +163,10 @@ public class MobileNetworkUtils {
isWifiCallingEnabled = intent != null; isWifiCallingEnabled = intent != null;
} else { } else {
final WifiCallingQueryImsState queryState =
new WifiCallingQueryImsState(context, subId);
final ImsManager imsMgr = ImsManager.getInstance(context, phoneId); final ImsManager imsMgr = ImsManager.getInstance(context, phoneId);
isWifiCallingEnabled = imsMgr != null isWifiCallingEnabled = queryState.isWifiCallingProvisioned()
&& imsMgr.isWfcEnabledByPlatform()
&& isWfcProvisionedOnDevice(subId)
&& isImsServiceStateReady(imsMgr); && isImsServiceStateReady(imsMgr);
} }