commit 1beee88d57316e9b095fd9019e9cd837e39ea242
author SongFerng Wang <songferngwang@google.com> Wed Feb 10 08:33:20 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 10 08:33:20 2021 +0000
tree 22271b6ddb08eb47766c80e32cf37d61f37cfcf0
parent a689c1bbffc5469c524c3fe741ffa86a4d191eb2
parent 961c3184cf6cd6adc4b3ac76ba40e8192183793a

Merge "Add NR SA OVERRIDE_NETWORK_TYPE_NR_ADVANCED for TelephonyDisplayInfo"

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index ee99e09..a6a211e 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -550,8 +550,11 @@
             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";
         }