From e5753cd32556723f4c184481aea143067c3091dd Mon Sep 17 00:00:00 2001 From: Ling Ma Date: Fri, 5 Aug 2022 23:21:12 -0700 Subject: [PATCH] Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY to carrier config, which indicates the capabilities that are exempt from the single PDN rule. Fix: 237550962 Test: atest + cts Change-Id: Ie49f6274d8e780534e203d6d0a5ead4ed2f3cfa7 Merged-In: Ie49f6274d8e780534e203d6d0a5ead4ed2f3cfa7 --- .../android/telephony/CarrierConfigManager.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 0d0142c330ce..dc2c39354b6c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -567,6 +567,17 @@ public class CarrierConfigManager { public static final String KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY = "only_single_dc_allowed_int_array"; + /** + * List of network capabilities which, if requested, will exempt the request from single PDN + * connection checks. + * @see NetworkCapabilities NET_CAPABILITY_* + * @see #KEY_ONLY_SINGLE_DC_ALLOWED_INT_ARRAY + * + * @hide + */ + public static final String KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY = + "capabilities_exempt_from_single_dc_check_int_array"; + /** * Override the platform's notion of a network operator being considered roaming. * Value is string array of MCCMNCs to be considered roaming for 3GPP RATs. @@ -6030,6 +6041,8 @@ public class CarrierConfigManager { new int[] {TelephonyManager.NETWORK_TYPE_CDMA, TelephonyManager.NETWORK_TYPE_1xRTT, TelephonyManager.NETWORK_TYPE_EVDO_0, TelephonyManager.NETWORK_TYPE_EVDO_A, TelephonyManager.NETWORK_TYPE_EVDO_B}); + sDefaults.putIntArray(KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY, + new int[] {NetworkCapabilities.NET_CAPABILITY_IMS}); sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null); sDefaults.putString(KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING, null);