diff options
| author | 2022-09-02 19:28:31 +0000 | |
|---|---|---|
| committer | 2022-09-02 19:28:31 +0000 | |
| commit | fbc2bcad4a6d01e6070ac37d516ac0b099f3056e (patch) | |
| tree | 2f0253eeef0949c1e9bd6db4799fdec1e8cef340 | |
| parent | 632d2ff270fa1ba8074eb9f31fbba29852ba23b0 (diff) | |
| parent | 4a4b536059e7123dd38c262438d0d6266b4fe6c9 (diff) | |
Merge "Add KEY_CAPABILITIES_EXEMPT_FROM_SINGLE_DC_CHECK_INT_ARRAY" am: c845883448 am: 4a4b536059
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2200209
Change-Id: Ifdf884b81d058af80ea80a1797a8c590ef4a5169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index e032f65f3427..cf6d681d596a 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -584,6 +584,17 @@ public class CarrierConfigManager { 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. */ @@ -8749,6 +8760,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); |