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

Merge "Add CarrierConfig for metered roaming" into nyc-dev

Browse Source 
am: 73efde0

* commit '73efde04efc5d8e36cf1eb2e0fa2bb52a4a326e1':
  Add CarrierConfig for metered roaming

Change-Id: Ic3955a4a208dcf206d607cda25eee03c37e96a1e
This commit is contained in:
fionaxu
2016-04-26 22:50:14 +00:00
committed by android-build-merger
parent 1fab8d995e 73efde04ef
commit c1df936c16
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
@@ -758,6 +763,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);