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

Commit 1d45b328 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Update AccessNetworkType for NR" am: 322f00e3 am: 39cf3d1d 

Change-Id: I062b9e464d072ea19b1ef9be5d48a1a23b3889be
parents e098f107 39cf3d1d

telephony/java/android/telephony/ServiceState.java

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