Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39cf3d1d authored by Sarah Chin's avatar Sarah Chin Committed by android-build-merger
Browse files

Merge "Update AccessNetworkType for NR" 

am: 322f00e3

Change-Id: I5bd216d080abca87efb14e7e3d201a3ca08bc7d1
parents 87e60d54 322f00e3

telephony/java/android/telephony/ServiceState.java

+3 −2
Original line number Diff line number Diff line
@@ -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: