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

Merge "Fixed CTS CtsUsageStatsTestCases test cases" into pi-dev

Browse Source 
am: 8f6568f908

Change-Id: I1ab715aa93609d653b689ef3570135d03c669cdf
This commit is contained in:
Jack Yu
2018-04-21 10:30:58 -07:00
committed by android-build-merger
parent 532406eee3 8f6568f908
commit 30a65dfb4a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2077,9 +2077,14 @@ public class CarrierConfigManager {
new String[]{"default", "mms", "dun", "supl"});
sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS,
new String[]{"default", "mms", "dun", "supl"});
// By default all APNs are unmetered if the device is on IWLAN.
// 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[]{});
new String[]{"default"});
sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY,
new int[]{