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

Commit 2b4b00af authored by Sarah Chin's avatar Sarah Chin Committed by android-build-merger
Browse files

Merge "Add NETWORK_TYPE_NR to Telephony framework" into qt-qpr1-dev 

am: c60e0323

Change-Id: Ib9aec9f24b7b81b56631f8a4a2ceaba8c6bb47e1
parents 94e08797 c60e0323

telephony/java/android/telephony/ServiceState.java

+8 −1
Original line number Diff line number Diff line
@@ -987,6 +987,9 @@ public class ServiceState implements Parcelable { 
            case RIL_RADIO_TECHNOLOGY_LTE_CA:

                rtString = "LTE_CA";

                break;

            case RIL_RADIO_TECHNOLOGY_NR:

                rtString = "LTE_NR";

                break;

            default:

                rtString = "Unexpected";

                Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt);
@@ -1553,6 +1556,7 @@ 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_IWLAN:

                return AccessNetworkType.IWLAN;
@@ -1601,6 +1605,8 @@ public class ServiceState implements Parcelable { 
                return ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;

            case TelephonyManager.NETWORK_TYPE_LTE_CA:

                return ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA;

            case TelephonyManager.NETWORK_TYPE_NR:

                return ServiceState.RIL_RADIO_TECHNOLOGY_NR;

            default:

                return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;

        }
@@ -1691,7 +1697,8 @@ public class ServiceState implements Parcelable { 
                || radioTechnology == RIL_RADIO_TECHNOLOGY_GSM

                || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA

                || radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN

                || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA;

                || radioTechnology == RIL_RADIO_TECHNOLOGY_LTE_CA

                || radioTechnology == RIL_RADIO_TECHNOLOGY_NR;



    }

telephony/java/android/telephony/TelephonyManager.java

+4 −0
Original line number Diff line number Diff line
@@ -2725,6 +2725,8 @@ public class TelephonyManager { 
    /** Class of broadly defined "4G" networks. {@hide} */

    @UnsupportedAppUsage

    public static final int NETWORK_CLASS_4_G = 3;

    /** Class of broadly defined "5G" networks. {@hide} */

    public static final int NETWORK_CLASS_5_G = 4;



    /**

     * Return general class of network type, such as "3G" or "4G". In cases
@@ -2757,6 +2759,8 @@ public class TelephonyManager { 
            case NETWORK_TYPE_IWLAN:

            case NETWORK_TYPE_LTE_CA:

                return NETWORK_CLASS_4_G;

            case NETWORK_TYPE_NR:

                return NETWORK_CLASS_5_G;

            default:

                return NETWORK_CLASS_UNKNOWN;

        }