Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" into tm-qpr-dev (b346a79c) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -583,6 +583,17 @@ public class CarrierConfigManager {
		public static final String
		KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array";

		/**
		* List of network capabilities which, if requested, will exempt the request from single PDN
		* connection checks.
		* @see NetworkCapabilities NET_CAPABILITY_*
		* @see #KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY
		*
		* @hide
		*/
		public static final String KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY =
		"capabilities_exempt_from_single_dc_check_int_array";

		/**
		* Override the platform's notion of a network operator being considered roaming.
		* Value is string array of MCCMNCs to be considered roaming for 3GPP RATs.
		@@ -8749,6 +8760,8 @@ public class CarrierConfigManager {
		new int[] {TelephonyManager.NETWORK_TYPE_CDMA, TelephonyManager.NETWORK_TYPE_1xRTT,
		TelephonyManager.NETWORK_TYPE_EVDO_0, TelephonyManager.NETWORK_TYPE_EVDO_A,
		TelephonyManager.NETWORK_TYPE_EVDO_B});
		sDefaults.putIntArray(KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY,
		new int[] {NetworkCapabilities.NET_CAPABILITY_IMS});
		sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putString(KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING, null);