diff options
author | Jimmy Chen <jimmycmchen@google.com> | 2020-06-17 08:43:07 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 08:43:07 +0000 |
commit | 4f1a10d2995f29526de5cb68a9cb4fdad2988815 (patch) | |
tree | 57d9d7efa2078e5c16117b78cdbef142616e9c98 /service | |
parent | 9400a6fbe5f119e9a1f4b6a933127cc952f6377b (diff) | |
parent | 004d0bb26f44f0265477909e6119673a5a8df76c (diff) |
Merge "wifi: remove LTE voice network check for wifi off deferring" into rvc-dev am: 004d0bb26f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/11865449
Change-Id: I796d3db657ed85be971d6ee88ef385476f8fd568
Diffstat (limited to 'service')
-rw-r--r-- | service/java/com/android/server/wifi/ClientModeManager.java | 11 |
1 files changed, 0 insertions, 11 deletions
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); |