Merge "Add NETWORK_TYPE_NR to Telephony framework" (19bf3319) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -988,6 +988,9 @@ public class ServiceState implements Parcelable {
	case RIL_RADIO_TECHNOLOGY_LTE_CA:		case RIL_RADIO_TECHNOLOGY_LTE_CA:
	rtString = "LTE_CA";		rtString = "LTE_CA";
	break;		break;
			case RIL_RADIO_TECHNOLOGY_NR:
			rtString = "LTE_NR";
			break;
	default:		default:
	rtString = "Unexpected";		rtString = "Unexpected";
	Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt);		Rlog.w(LOG_TAG, "Unexpected radioTechnology=" + rt);
	@@ -1554,6 +1557,7 @@ 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_IWLAN:		case RIL_RADIO_TECHNOLOGY_IWLAN:
	return AccessNetworkType.IWLAN;		return AccessNetworkType.IWLAN;
	@@ -1602,6 +1606,8 @@ public class ServiceState implements Parcelable {
	return ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;		return ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN;
	case TelephonyManager.NETWORK_TYPE_LTE_CA:		case TelephonyManager.NETWORK_TYPE_LTE_CA:
	return ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA;		return ServiceState.RIL_RADIO_TECHNOLOGY_LTE_CA;
			case TelephonyManager.NETWORK_TYPE_NR:
			return ServiceState.RIL_RADIO_TECHNOLOGY_NR;
	default:		default:
	return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;		return ServiceState.RIL_RADIO_TECHNOLOGY_UNKNOWN;
	}		}
	@@ -1692,7 +1698,8 @@ public class ServiceState implements Parcelable {
	\|\| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM		\|\| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM
	\|\| radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA		\|\| radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA
	\|\| radioTechnology == RIL_RADIO_TECHNOLOGY_IWLAN		\|\| 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	Original line	Diff line number	Diff line
	@@ -2784,6 +2784,8 @@ public class TelephonyManager {
	/** Class of broadly defined "4G" networks. {@hide} */		/** Class of broadly defined "4G" networks. {@hide} */
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static final int NETWORK_CLASS_4_G = 3;		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		* Return general class of network type, such as "3G" or "4G". In cases
	@@ -2816,6 +2818,8 @@ public class TelephonyManager {
	case NETWORK_TYPE_IWLAN:		case NETWORK_TYPE_IWLAN:
	case NETWORK_TYPE_LTE_CA:		case NETWORK_TYPE_LTE_CA:
	return NETWORK_CLASS_4_G;		return NETWORK_CLASS_4_G;
			case NETWORK_TYPE_NR:
			return NETWORK_CLASS_5_G;
	default:		default:
	return NETWORK_CLASS_UNKNOWN;		return NETWORK_CLASS_UNKNOWN;
	}		}