drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed incorrect metered/unmetered APN in AP-assisted mode"

Browse Source 
am: 149edbd87b

Change-Id: Ia204a5ceebfc97f0f15cae94b1ec4f4aca78c231
This commit is contained in:
Jack Yu 2019-05-14 20:32:49 -07:00 committed by android-build-merger
commit 019f54d32f
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -835,13 +835,6 @@ 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";
/**
* 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
@ -2840,15 +2833,6 @@ 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 should be unmetered if the device is on IWLAN. However, we add
// default APN as metered here as a workaround for P because in some cases, a data
// connection was brought up on cellular, but later on the device camped on IWLAN. That
// data connection was incorrectly treated as unmetered due to the current RAT IWLAN.
// Marking it as metered for now can workaround the issue.
// Todo: This will be fixed in Q when IWLAN full refactoring is completed.
sDefaults.putStringArray(KEY_CARRIER_METERED_IWLAN_APN_TYPES_STRINGS,
new String[]{"default"});
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 */

17
telephony/java/android/telephony/data/ApnSetting.java
View File

@ -1272,6 +1272,23 @@ public class ApnSetting implements Parcelable {
return apnValue; return apnValue;
} }
/**
* Get supported APN types
*
* @return list of APN types
* @hide
*/
@ApnType
public List<Integer> getApnTypes() {
List<Integer> types = new ArrayList<>();
for (Integer type : APN_TYPE_INT_MAP.keySet()) {
if ((mApnTypeBitmask & type) == type) {
types.add(type);
}
}
return types;
}
/** /**
* @param apnTypeBitmask bitmask of APN types. * @param apnTypeBitmask bitmask of APN types.
* @return comma delimited list of APN types. * @return comma delimited list of APN types.