diff options
| author | 2017-05-22 23:21:00 +0000 | |
|---|---|---|
| committer | 2017-05-22 23:21:06 +0000 | |
| commit | 4284eb44c1fa8634fce076c19613f4fd0c59da9d (patch) | |
| tree | 5da01a0935c51a151b89573c36220fbb50ca7ffa | |
| parent | 665cb106f48b43e9550facccc1b0e7653a58b890 (diff) | |
| parent | 7dc56eedf37281bfcf2318483b842ae1b703ee14 (diff) | |
Merge "Added IWLAN metered APN support"
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index fe3799595c75..f2d2253a8f38 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -582,11 +582,19 @@ 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 + * Default APN types that are roaming-metered by the carrier * @hide */ public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS = "carrier_metered_roaming_apn_types_strings"; + + /** + * Default APN types that are metered on IWLAN by the carrier + * @hide + */ + public static final String KEY_CARRIER_METERED_IWLAN_APN_TYPES_STRINGS = + "carrier_metered_iwlan_apn_types_strings"; + /** * CDMA carrier ERI (Enhanced Roaming Indicator) file name * @hide @@ -1534,6 +1542,9 @@ public class CarrierConfigManager { new String[]{"default", "mms", "dun", "supl"}); sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS, new String[]{"default", "mms", "dun", "supl"}); + // By default all APNs are unmetered if the device is on IWLAN. + sDefaults.putStringArray(KEY_CARRIER_METERED_IWLAN_APN_TYPES_STRINGS, + new String[]{}); sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY, new int[]{ |