Merge "Fix doc of NETWORK_TYPE_NR & add converter" am: 1abe6aa53f (8a5c3bc6) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+43 −41

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

		/** @hide */
		public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rt) {
		switch(rt) {
		public static int rilRadioTechnologyToNetworkType(@RilRadioTechnology int rat) {
		switch(rat) {
		case ServiceState.RIL_RADIO_TECHNOLOGY_GPRS:
		return TelephonyManager.NETWORK_TYPE_GPRS;
		case ServiceState.RIL_RADIO_TECHNOLOGY_EDGE:
		@@ -1449,6 +1449,8 @@ public class ServiceState implements Parcelable {
		return TelephonyManager.NETWORK_TYPE_IWLAN;
		case ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA:
		return TelephonyManager.NETWORK_TYPE_LTE_CA;
		case ServiceState.RIL_RADIO_TECHNOLOGY_NR:
		return TelephonyManager.NETWORK_TYPE_NR;
		default:
		return TelephonyManager.NETWORK_TYPE_UNKNOWN;
		}

+5 −0

Original line number	Diff line number	Diff line
		@@ -835,6 +835,7 @@ public class TelephonyManager {
		* @see TelephonyManager#NETWORK_TYPE_LTE
		* @see TelephonyManager#NETWORK_TYPE_EHRPD
		* @see TelephonyManager#NETWORK_TYPE_HSPAP
		* @see TelephonyManager#NETWORK_TYPE_NR
		*
		* <p class="note">
		* Retrieve with
		@@ -2306,6 +2307,7 @@ public class TelephonyManager {
		* @see #NETWORK_TYPE_LTE
		* @see #NETWORK_TYPE_EHRPD
		* @see #NETWORK_TYPE_HSPAP
		* @see #NETWORK_TYPE_NR
		*
		* @hide
		*/
		@@ -2357,6 +2359,7 @@ public class TelephonyManager {
		* @see #NETWORK_TYPE_LTE
		* @see #NETWORK_TYPE_EHRPD
		* @see #NETWORK_TYPE_HSPAP
		* @see #NETWORK_TYPE_NR
		*/
		@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
		@RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)
		@@ -2543,6 +2546,8 @@ public class TelephonyManager {
		return "IWLAN";
		case NETWORK_TYPE_LTE_CA:
		return "LTE_CA";
		case NETWORK_TYPE_NR:
		return "NR";
		default:
		return "UNKNOWN";
		}