Merge "Added disallowed APN types configuration support" am: 13b0b1a73d (639621cc) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -851,6 +851,19 @@ public class CarrierConfigManager {
		public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS =
		"carrier_metered_roaming_apn_types_strings";

		/**
		* APN types that are not allowed on cellular
		* @hide
		*/
		public static final String KEY_CARRIER_WWAN_DISALLOWED_APN_TYPES_STRING_ARRAY =
		"carrier_wwan_disallowed_apn_types_string_array";

		/**
		* APN types that are not allowed on IWLAN
		* @hide
		*/
		public static final String KEY_CARRIER_WLAN_DISALLOWED_APN_TYPES_STRING_ARRAY =
		"carrier_wlan_disallowed_apn_types_string_array";
		/**
		* CDMA carrier ERI (Enhanced Roaming Indicator) file name
		* @hide
		@@ -3198,6 +3211,10 @@ public class CarrierConfigManager {
		new String[]{"default", "mms", "dun", "supl"});
		sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
		new String[]{"default", "mms", "dun", "supl"});
		sDefaults.putStringArray(KEY_CARRIER_WWAN_DISALLOWED_APN_TYPES_STRING_ARRAY,
		new String[]{""});
		sDefaults.putStringArray(KEY_CARRIER_WLAN_DISALLOWED_APN_TYPES_STRING_ARRAY,
		new String[]{""});
		sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,
		new int[]{
		4, /* IS95A */