From a5035d9ce748dbf2c58dc1970a28c52e945eb548 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Mon, 8 Feb 2021 16:16:35 +0800 Subject: [PATCH] Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo NetworkTypeController set OVERRIDE_NETWORK_TYPE_NR_ADVANCED when device connect NR and frequency is mmWave. Bug: 179443240 Bug: 179453836 Test: atest frameworks/opt/telephony/src/java/com/android/internal/telephony/NetworkTypeController.java atest packages/apps/Settings/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java Change-Id: Ib95f6a012c0f725335f46e17b8414005a76ad5c9 Merged-In: Ib95f6a012c0f725335f46e17b8414005a76ad5c9 --- .../deviceinfo/simstatus/SimStatusDialogController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index ee99e0954ac..a6a211eada7 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -550,8 +550,11 @@ public class SimStatusDialogController implements LifecycleObserver { voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType); } - if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE - || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) { + final boolean isOverrideNwTypeNrAdvancedOrNsa = + overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_ADVANCED + || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA; + if (actualDataNetworkType == TelephonyManager.NETWORK_TYPE_LTE + && isOverrideNwTypeNrAdvancedOrNsa) { dataNetworkTypeName = "NR NSA"; }