Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo"

This commit is contained in:
Sarah Chin
2021-06-08 20:47:10 +00:00
committed by Gerrit Code Review

View File

@@ -538,8 +538,11 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType); voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType);
} }
if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE final boolean isOverrideNwTypeNrAdvancedOrNsa =
|| overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) { overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED
|| overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA;
if (actualDataNetworkType == TelephonyManager.NETWORK_TYPE_LTE
&& isOverrideNwTypeNrAdvancedOrNsa) {
dataNetworkTypeName = "NR NSA"; dataNetworkTypeName = "NR NSA";
} }