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

Merge "Added disallowed APN types configuration support" into qt-r1-dev

Browse Source 
am: a240c31268

Change-Id: Ib9cc7dc5b6f68bd0c77f034b4aeb734fd912dd12
This commit is contained in:
Chen Xu
2019-07-02 11:07:53 -07:00
committed by android-build-merger
parent c9320a57c6 a240c31268
commit 48aeaefd3b
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 =
"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
* @hide
@@ -3173,6 +3186,10 @@ public class CarrierConfigManager {
new String[]{"default", "mms", "dun", "supl"});
sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
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,
new int[]{
4, /* IS95A */