From c7b1211b0ba66936bfee6c65d4efcd425a5c7b0e Mon Sep 17 00:00:00 2001 From: Ling Ma Date: Tue, 20 Jun 2023 15:03:13 -0700 Subject: [PATCH] Add enterprise to metered APN In consistent with S, enterprise APN type is considered metered, move from hard coded Dctracker setup evaluation to the config default value. Bug: 284152056 Test: daily testing (b/288038359 : p23 + b/288038354: P22 ) Change-Id: I4d71f5f260d131fe6f6341c13c2e3e7628b3f740 --- telephony/java/android/telephony/CarrierConfigManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 5b946e8540d1f..dc5b75ad6f145 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -9897,9 +9897,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,