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

Commit 3955593f authored by Pengquan Meng's avatar Pengquan Meng
Browse files

Fix doc of NETWORK_TYPE_NR & add converter 

This fix some documents related to NETWORK_TYPE_NR and add a converter
from ril rat to NETWORK_TYPE_NR.

Bug: 111453000
Test: build
Change-Id: Ib9ee0dbe0234ef1bf9ef22900b00ddd47195914f
parent a14aac8a

telephony/java/android/telephony/ServiceState.java

+43 −41
Original line number Original line Diff line number Diff line
@@ -1410,8 +1410,8 @@ public class ServiceState implements Parcelable { 
    }

    }





    /** @hide */

    /** @hide */

    public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rt) {

    public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rat) {

        switch(rt) {

        switch(rat) {

            case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS:

            case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS:

                return TelephonyManager.NETWORK_TYPE_GPRS;

                return TelephonyManager.NETWORK_TYPE_GPRS;

            case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE:

            case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE:
@@ -1449,6 +1449,8 @@ public class ServiceState implements Parcelable { 
                return TelephonyManager.NETWORK_TYPE_IWLAN;

                return TelephonyManager.NETWORK_TYPE_IWLAN;

            case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:

            case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:

                return TelephonyManager.NETWORK_TYPE_LTE_CA;

                return TelephonyManager.NETWORK_TYPE_LTE_CA;

            case ServiceState.RIL_RADIO_TECHNOLOGY_NR:

                return TelephonyManager.NETWORK_TYPE_NR;

            default:

            default:

                return TelephonyManager.NETWORK_TYPE_UNKNOWN;

                return TelephonyManager.NETWORK_TYPE_UNKNOWN;

        }

        }

telephony/java/android/telephony/TelephonyManager.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -810,6 +810,7 @@ public class TelephonyManager { 
     * @see TelephonyManager#NETWORK_TYPE_LTE

     * @see TelephonyManager#NETWORK_TYPE_LTE

     * @see TelephonyManager#NETWORK_TYPE_EHRPD

     * @see TelephonyManager#NETWORK_TYPE_EHRPD

     * @see TelephonyManager#NETWORK_TYPE_HSPAP

     * @see TelephonyManager#NETWORK_TYPE_HSPAP

     * @see TelephonyManager#NETWORK_TYPE_NR

     *

     *

     * <p class="note">

     * <p class="note">

     * Retrieve with

     * Retrieve with
@@ -2328,6 +2329,7 @@ public class TelephonyManager { 
     * @see #NETWORK_TYPE_LTE

     * @see #NETWORK_TYPE_LTE

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_HSPAP

     * @see #NETWORK_TYPE_HSPAP

     * @see #NETWORK_TYPE_NR

     *

     *

     * @hide

     * @hide

     */

     */
@@ -2379,6 +2381,7 @@ public class TelephonyManager { 
     * @see #NETWORK_TYPE_LTE

     * @see #NETWORK_TYPE_LTE

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_EHRPD

     * @see #NETWORK_TYPE_HSPAP

     * @see #NETWORK_TYPE_HSPAP

     * @see #NETWORK_TYPE_NR

     */

     */

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
@@ -2565,6 +2568,8 @@ public class TelephonyManager { 
                return "IWLAN";

                return "IWLAN";

            case NETWORK_TYPE_LTE_CA:

            case NETWORK_TYPE_LTE_CA:

                return "LTE_CA";

                return "LTE_CA";

            case NETWORK_TYPE_NR:

                return "NR";

            default:

            default:

                return "UNKNOWN";

                return "UNKNOWN";

        }

        }