Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo"

This commit is contained in:
SongFerng Wang
2021-02-10 08:33:20 +00:00
committed by Android (Google) Code Review

View File

@@ -550,8 +550,11 @@ public class SimStatusDialogController implements LifecycleObserver {
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";
} }