commit 8222d88548d4899a7b2f695219a6bc18e7a2962c
author Sarah Chin <sarahchin@google.com> Tue Jun 08 20:47:10 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 08 20:47:10 2021 +0000
tree e3c2494e938a9f6b059955925b76b156c5fce022
parent 5f1034bce03bda6ed2b997877fb7974c6a13407b
parent d3ccf4b54133103a788652976ff46ce9829f2e24

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 10409fc..4d1fd49 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -538,8 +538,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";
         }