diff options
| author | 2023-06-26 13:06:35 +0000 | |
|---|---|---|
| committer | 2023-06-26 13:06:35 +0000 | |
| commit | b1c0df33567397611a288dc88a6beb2b8da023df (patch) | |
| tree | 53029a79185316a57350f0cf202bb63a418984c7 /telephony | |
| parent | 34b9cb3cf0498218161956fd4cd71e23fda288fe (diff) | |
| parent | 34775786d6f1881cf32a185e24f5a98117e8791e (diff) | |
Merge "Add enterprise to metered APN" am: 852b5df9d9 am: a7aa3d68d0 am: 34775786d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2635551
Change-Id: Icb657fba4816e9da2bb989c8e7d279c8c9c2e312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5b1c6b1c88b8..7193de789743 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -9876,9 +9876,9 @@ public class CarrierConfigManager { sDefaults.putString(KEY_CARRIER_ERI_FILE_NAME_STRING, "eri.xml"); sDefaults.putInt(KEY_DURATION_BLOCKING_DISABLED_AFTER_EMERGENCY_INT, 7200); sDefaults.putStringArray(KEY_CARRIER_METERED_APN_TYPES_STRINGS, - new String[]{"default", "mms", "dun", "supl"}); + new String[]{"default", "mms", "dun", "supl", "enterprise"}); sDefaults.putStringArray(KEY_CARRIER_METERED_ROAMING_APN_TYPES_STRINGS, - new String[]{"default", "mms", "dun", "supl"}); + new String[]{"default", "mms", "dun", "supl", "enterprise"}); sDefaults.putIntArray(KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY, new int[] {TelephonyManager.NETWORK_TYPE_CDMA, TelephonyManager.NETWORK_TYPE_1xRTT, TelephonyManager.NETWORK_TYPE_EVDO_0, TelephonyManager.NETWORK_TYPE_EVDO_A, |