Merge "Update API doc for accidentally exposed NETWORK_TYPE_BITMASK_LTE_CA" into tm-dev (91604b8e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+21 −0

Original line number	Diff line number	Diff line
		@@ -9290,6 +9290,7 @@ public class TelephonyManager {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		networkTypeBitmask = checkNetworkTypeBitmask(networkTypeBitmask);
		return telephony.setAllowedNetworkTypesForReason(getSubId(),
		TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER, networkTypeBitmask);
		}
		@@ -9299,6 +9300,20 @@ public class TelephonyManager {
		return false;
		}

		/**
		* If {@link #NETWORK_TYPE_BITMASK_LTE_CA} bit is set, convert it to NETWORK_TYPE_BITMASK_LTE.
		*
		* @param networkTypeBitmask The networkTypeBitmask being checked
		* @return The checked/converted networkTypeBitmask
		*/
		private long checkNetworkTypeBitmask(@NetworkTypeBitMask long networkTypeBitmask) {
		if ((networkTypeBitmask & NETWORK_TYPE_BITMASK_LTE_CA) != 0) {
		networkTypeBitmask ^= NETWORK_TYPE_BITMASK_LTE_CA;
		networkTypeBitmask \|= NETWORK_TYPE_BITMASK_LTE;
		}
		return networkTypeBitmask;
		}

		/**
		* Set the allowed network types of the device. This is for carrier or privileged apps to
		* enable/disable certain network types on the device. The user preferred network types should
		@@ -9325,6 +9340,7 @@ public class TelephonyManager {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		allowedNetworkTypes = checkNetworkTypeBitmask(allowedNetworkTypes);
		return telephony.setAllowedNetworkTypesForReason(getSubId(),
		TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER, allowedNetworkTypes);
		}
		@@ -9410,6 +9426,7 @@ public class TelephonyManager {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		allowedNetworkTypes = checkNetworkTypeBitmask(allowedNetworkTypes);
		telephony.setAllowedNetworkTypesForReason(getSubId(), reason,
		allowedNetworkTypes);
		} else {
		@@ -13727,7 +13744,11 @@ public class TelephonyManager {
		*/
		public static final long NETWORK_TYPE_BITMASK_LTE = (1 << (NETWORK_TYPE_LTE -1));
		/**
		* NOT USED; this bitmask is exposed accidentally, will be deprecated in U.
		* If used, will be converted to {@link #NETWORK_TYPE_BITMASK_LTE}.
		* network type bitmask indicating the support of radio tech LTE CA (carrier aggregation).
		*
		* @see #NETWORK_TYPE_BITMASK_LTE
		*/
		public static final long NETWORK_TYPE_BITMASK_LTE_CA = (1 << (NETWORK_TYPE_LTE_CA -1));