Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added IWLAN metered APN support

Browse Source 
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
This commit is contained in:
Jack Yu
2017-05-20 17:06:33 -07:00
parent 99cf40a25a
commit 89c04b52f5
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -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[]{