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

Merge "Added disallowed APN types configuration support" am: 13b0b1a73d

Browse Source 
am: b0bd8bedad

Change-Id: If7f34bad3433d20223b3591dd2332c35ce4b11a2
This commit is contained in:
Jack Yu
2019-08-07 21:42:27 -07:00
committed by android-build-merger
parent 66c6c0b5a1 b0bd8bedad
commit 639621cc19
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -851,6 +851,19 @@ public class CarrierConfigManager {
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";
/**
* APN types that are not allowed on cellular
* @hide
*/
public static final String KEY_CARRIER_WWAN_DISALLOWED_APN_TYPES_STRING_ARRAY =
"carrier_wwan_disallowed_apn_types_string_array";
/**
* APN types that are not allowed on IWLAN
* @hide
*/
public static final String KEY_CARRIER_WLAN_DISALLOWED_APN_TYPES_STRING_ARRAY =
"carrier_wlan_disallowed_apn_types_string_array";
/** /**
* CDMA carrier ERI (Enhanced Roaming Indicator) file name * CDMA carrier ERI (Enhanced Roaming Indicator) file name
* @hide * @hide
@@ -3198,6 +3211,10 @@ 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"});
sDefaults.putStringArray(KEY_CARRIER_WWAN_DISALLOWED_APN_TYPES_STRING_ARRAY,
new String[]{""});
sDefaults.putStringArray(KEY_CARRIER_WLAN_DISALLOWED_APN_TYPES_STRING_ARRAY,
new String[]{""});
sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY, sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,
new int[]{ new int[]{
4, /* IS95A */ 4, /* IS95A */