Merge "Update AccessNetworkType for NR"

am: 322f00e30f

Change-Id: I5bd216d080abca87efb14e7e3d201a3ca08bc7d1
This commit is contained in:
Sarah Chin
2019-12-16 12:10:30 -08:00
committed by android-build-merger

View File

@@ -941,7 +941,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";
@@ -1479,8 +1479,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: