From f9db9eb1fd52975a6570fdd1bd346efb896b890c Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Mon, 15 Jun 2020 15:58:11 +0800 Subject: wifi: remove LTE voice network check for wifi off deferring LTE can also be available with partial registration with voice network type while IMS is registered on IWLAN as voice network. The fact that IMS is registered over IWLAN would suffice the need of delaying the wifi off (or disconnect) Bug: 158821908 Test: atest FrameworksWifiTests Change-Id: Ifdb3fe2ac4d8fd5679e256cde767fe14d5c8944a --- service/java/com/android/server/wifi/ClientModeManager.java | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/ClientModeManager.java b/service/java/com/android/server/wifi/ClientModeManager.java index 608933950..4fb4b870d 100644 --- a/service/java/com/android/server/wifi/ClientModeManager.java +++ b/service/java/com/android/server/wifi/ClientModeManager.java @@ -35,7 +35,6 @@ import android.telephony.AccessNetworkConstants; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import android.telephony.TelephonyManager; import android.telephony.ims.ImsException; import android.telephony.ims.ImsMmTelManager; import android.telephony.ims.ImsReasonInfo; @@ -322,16 +321,6 @@ public class ClientModeManager implements ActiveModeManager { return 0; } - TelephonyManager defaultVoiceTelephonyManager = - mContext.getSystemService(TelephonyManager.class) - .createForSubscriptionId(subId); - // if LTE is available, no delay needed as IMS will be registered over LTE - if (defaultVoiceTelephonyManager.getVoiceNetworkType() - == TelephonyManager.NETWORK_TYPE_LTE) { - Log.d(TAG, "LTE available and is default voice network type"); - return 0; - } - CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE); PersistableBundle config = configManager.getConfigForSubId(subId); -- cgit v1.2.3