commit 322f00e30ffde42b782b5093bffab1c3acea46f1
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 16 19:38:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 16 19:38:41 2019 +0000
tree 13220900f24031c7294c9eec12c35696119ac2d2
parent 41c13aa1231854252f8d79249fadacd043af919a
parent d1941e57c588e747a4f38d2752eac2d8c711fabb

Merge "Update AccessNetworkType for NR"

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index d2c8517..d7d85c2 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -941,7 +941,7 @@
                 rtString = "LTE_CA";
                 break;
             case RIL_RADIO_TECHNOLOGY_NR:
-                rtString = "LTE_NR";
+                rtString = "NR_SA";
                 break;
             default:
                 rtString = "Unexpected";
@@ -1479,8 +1479,9 @@
                 return AccessNetworkType.CDMA2000;
             case RIL_RADIO_TECHNOLOGY_LTE:
             case RIL_RADIO_TECHNOLOGY_LTE_CA:
-            case RIL_RADIO_TECHNOLOGY_NR:
                 return AccessNetworkType.EUTRAN;
+            case RIL_RADIO_TECHNOLOGY_NR:
+                return AccessNetworkType.NGRAN;
             case RIL_RADIO_TECHNOLOGY_IWLAN:
                 return AccessNetworkType.IWLAN;
             case RIL_RADIO_TECHNOLOGY_UNKNOWN: