From 89c04b52f5de96c619e7ea599c3dff152aa6ce65 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Sat, 20 May 2017 17:06:33 -0700 Subject: [PATCH] Added IWLAN metered APN support If the device is in IWLAN mode, when checking if the APN type is metered, we read the settings from the IWLAN metered APN list. Test: Telephony unit tests bug: 38304530 Merged-In: I46c9e1a15dd0dd40811d5a959d558fc78608b127 Change-Id: I46c9e1a15dd0dd40811d5a959d558fc78608b127 --- telephony/java/android/telephony/CarrierConfigManager.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 7d22a2c5f511..e3d66e7599ee 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -574,11 +574,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 @@ -1443,6 +1451,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[]{ -- 2.11.0