Merge "fix the issue that setPreferredNW send wrong RAT to HAL" (4837dbe5) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/RadioAccessFamily.java

+0 −77

Original line number	Diff line number	Diff line
		@@ -397,81 +397,4 @@ public class RadioAccessFamily implements Parcelable {
		}
		return result;
		}

		/**
		* convert RAF from {@link android.hardware.radio.V1_0.RadioAccessFamily} to
		* {@link TelephonyManager.NetworkTypeBitMask}, the bitmask represented by
		* {@link TelephonyManager.NetworkType}.
		*
		* @param raf {@link android.hardware.radio.V1_0.RadioAccessFamily}
		* @return {@link TelephonyManager.NetworkTypeBitMask}
		*/
		public static int convertToNetworkTypeBitMask(int raf) {
		int networkTypeRaf = 0;

		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.GSM) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_GSM;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.GPRS) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_GPRS;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EDGE) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_EDGE;
		}
		// convert both IS95A/IS95B to CDMA as network mode doesn't support CDMA
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.IS95A) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.IS95B) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_CDMA;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.ONE_X_RTT) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_1xRTT;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_0) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_0;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_A) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_A;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EVDO_B) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_EVDO_B;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.EHRPD) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_EHRPD;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSUPA) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_HSUPA;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSDPA) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_HSDPA;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSPA) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_HSPA;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.HSPAP) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_HSPAP;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.UMTS) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_UMTS;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.TD_SCDMA) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_TD_SCDMA;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.LTE) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_LTE;
		}
		if ((raf & android.hardware.radio.V1_0.RadioAccessFamily.LTE_CA) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_LTE_CA;
		}
		if ((raf & android.hardware.radio.V1_4.RadioAccessFamily.NR) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_NR;
		}
		// TODO: need hal definition
		if ((raf & (1 << ServiceState.RIL_RADIO_TECHNOLOGY_IWLAN)) != 0) {
		networkTypeRaf \|= TelephonyManager.NETWORK_TYPE_BITMASK_IWLAN;
		}

		return (networkTypeRaf == 0) ? TelephonyManager.NETWORK_TYPE_UNKNOWN : networkTypeRaf;
		}
		}