Merge "Make sure on non-dds phone, try MMS data connection when PS is not attached." (e7418497) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+38 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.telephony;

		import static android.telephony.TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -1605,6 +1607,12 @@ public class ServiceState implements Parcelable {
		}
		}

		/** @hide */
		public static int networkTypeToAccessNetworkType(@TelephonyManager.NetworkType
		int networkType) {
		return rilRadioTechnologyToAccessNetworkType(networkTypeToRilRadioTechnology(networkType));
		}

		/**
		* Get current data network type.
		*
		@@ -1730,6 +1738,36 @@ public class ServiceState implements Parcelable {
		return false;
		}

		/**
		*
		* Returns whether the bearerBitmask includes a networkType that matches the accessNetworkType.
		*
		* The NetworkType refers to NetworkType in TelephonyManager. For example
		* {@link TelephonyManager#NETWORK_TYPE_GPRS}.
		*
		* The accessNetworkType refers to {@link AccessNetworkType}.
		*
		* @hide
		* */
		public static boolean networkBitmaskHasAccessNetworkType(
		@TelephonyManager.NetworkTypeBitMask int networkBitmask, int accessNetworkType) {
		if (networkBitmask == NETWORK_TYPE_BITMASK_UNKNOWN) return true;
		if (accessNetworkType == AccessNetworkType.UNKNOWN) return false;

		int networkType = 1;
		while (networkBitmask != 0) {
		if ((networkBitmask & 1) != 0) {
		if (networkTypeToAccessNetworkType(networkType) == accessNetworkType) {
		return true;
		}
		}
		networkBitmask = networkBitmask >> 1;
		networkType++;
		}

		return false;
		}

		/** @hide */
		public static int getBitmaskForTech(int radioTech) {
		if (radioTech >= 1) {