From d1941e57c588e747a4f38d2752eac2d8c711fabb Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Fri, 13 Dec 2019 11:12:28 -0800
Subject: [PATCH] Update AccessNetworkType for NR

Bug: 135421985
Test: atest ServiceStateTest
Change-Id: Ie18c1db9f1d9ac61a7a5e97e127cf93bdee164fa
---
 telephony/java/android/telephony/ServiceState.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 9ace86cea0c1c..3a9e79fa783b4 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -964,7 +964,7 @@ public class ServiceState implements Parcelable {
                 rtString = "LTE_CA";
                 break;
             case RIL_RADIO_TECHNOLOGY_NR:
-                rtString = "LTE_NR";
+                rtString = "NR_SA";
                 break;
             default:
                 rtString = "Unexpected";
@@ -1535,8 +1535,9 @@ public class ServiceState implements Parcelable {
                 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: