From 284a528847d5cc08c5dd62d8468bf275c7aa4a01 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 28 Jun 2019 16:42:37 -0700 Subject: [PATCH] Added disallowed APN types configuration support The change added the configuration support for disallowed APN types for WWAN or WLAN transport. This is to meet carrier policy that certain traffic for APN types are not allowed on given transport. Bug: 135551751 Test: Manual + unit tests Merged-in: I63c44d1e774b7491929406929e1a5a556db9515a Change-Id: I63c44d1e774b7491929406929e1a5a556db9515a (cherry picked from commit ac9a731d270552957641f15a5b58450003d5b964) --- .../android/telephony/CarrierConfigManager.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 77e35e1530bfd..73411ee001326 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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 @@ -2889,6 +2902,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 */