Merge "Update AccessNetworkType for NR"

This commit is contained in:
Treehugger Robot
2019-12-16 19:38:41 +00:00
committed by Gerrit Code Review

View File

@@ -941,7 +941,7 @@ public class ServiceState implements Parcelable {
rtString = "LTE_CA"; rtString = "LTE_CA";
break; break;
case RIL_RADIO_TECHNOLOGY_NR: case RIL_RADIO_TECHNOLOGY_NR:
rtString = "LTE_NR"; rtString = "NR_SA";
break; break;
default: default:
rtString = "Unexpected"; rtString = "Unexpected";
@@ -1479,8 +1479,9 @@ public class ServiceState implements Parcelable {
return AccessNetworkType.CDMA2000; return AccessNetworkType.CDMA2000;
case RIL_RADIO_TECHNOLOGY_LTE: case RIL_RADIO_TECHNOLOGY_LTE:
case RIL_RADIO_TECHNOLOGY_LTE_CA: case RIL_RADIO_TECHNOLOGY_LTE_CA:
case RIL_RADIO_TECHNOLOGY_NR:
return AccessNetworkType.EUTRAN; return AccessNetworkType.EUTRAN;
case RIL_RADIO_TECHNOLOGY_NR:
return AccessNetworkType.NGRAN;
case RIL_RADIO_TECHNOLOGY_IWLAN: case RIL_RADIO_TECHNOLOGY_IWLAN:
return AccessNetworkType.IWLAN; return AccessNetworkType.IWLAN;
case RIL_RADIO_TECHNOLOGY_UNKNOWN: case RIL_RADIO_TECHNOLOGY_UNKNOWN: