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

Merge "Added IWLAN metered APN support"

Browse Source 
am: 70fe11fc38

Change-Id: I12573353fca921d1454d6829302a379cd6b2cc8b
This commit is contained in:
Jack Yu
2017-05-23 01:10:29 +00:00
committed by android-build-merger
parent 3818d4187c 70fe11fc38
commit ab48527680
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 = 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 * Default APN types that are roaming-metered by the carrier
* @hide * @hide
*/ */
public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS = public static final String KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS =
"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 * CDMA carrier ERI (Enhanced Roaming Indicator) file name
* @hide * @hide
@@ -1437,6 +1445,9 @@ public class CarrierConfigManager {
new String[]{"default", "mms", "dun", "supl"}); new String[]{"default", "mms", "dun", "supl"});
sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS, sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
new String[]{"default", "mms", "dun", "supl"}); 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, sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,
new int[]{ new int[]{