From 28ffb600db33b62b5051177c70146bab74bdf0d3 Mon Sep 17 00:00:00 2001 From: fionaxu Date: Sun, 17 Apr 2016 23:56:42 -0700 Subject: [PATCH] Add CarrierConfig for metered roaming Bug: 26317905 Change-Id: Ib243de266736598cecdb8bcf76ac4db7275a1c01 --- .../java/android/telephony/CarrierConfigManager.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 26730de3344cb..614c4b34b03dd 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -425,7 +425,12 @@ public class CarrierConfigManager { */ public static final String KEY_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 * @hide @@ -737,6 +742,8 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200); sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS, 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_NONROAMING_NETWORKS_STRING_ARRAY, null);