Merge "Add CarrierConfig for metered roaming" into nyc-dev (73efde04) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -425,7 +425,12 @@ public class CarrierConfigManager {
	*/		*/
	public static final String KEY_CARRIER_METERED_APN_TYPES_STRINGS =		public static final String KEY_CARRIER_METERED_APN_TYPES_STRINGS =
	"carrier_metered_apn_types_strings";		"carrier_metered_apn_types_strings";
			/**
			* Default APN types that are roamig-metered by the carrier
			* @hide
			*/
			public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS =
			"carrier_metered_roaming_apn_types_strings";
	/**		/**
	* CDMA carrier ERI (Enhanced Roaming Indicator) file name		* CDMA carrier ERI (Enhanced Roaming Indicator) file name
	* @hide		* @hide
	@@ -758,6 +763,8 @@ public class CarrierConfigManager {
	sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200);		sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200);
	sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS,		sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS,
	new String[]{"default", "mms", "dun", "supl"});		new String[]{"default", "mms", "dun", "supl"});
			sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
			new String[]{"default", "mms", "dun", "supl"});

	sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);		sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);
	sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);		sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);