From b419fa0b099f8956a6ee47fbf219732c495445fc Mon Sep 17 00:00:00 2001 From: chiachangwang Date: Mon, 29 May 2023 06:02:20 +0000 Subject: [PATCH] Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT Some carriers' networks not support IPv6 very well. The existing default value(0) will use IPv6 if networks support IPv6. Update the default value to an invalid value so that the code that uses the key could tell and fall into a reasonable case. Bug: 269714970 Bug: 284246686 Test: m ; flash and check the value (cherry picked from https://android-review.googlesource.com/q/commit:437f84c62671ba30ae62cb21a28be2323d671ad1) Merged-In: Ie2b42e69702609b132acd6bd087292bf9df365cb Change-Id: Ie2b42e69702609b132acd6bd087292bf9df365cb --- telephony/java/android/telephony/CarrierConfigManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 188894339f6a5..5b1c6b1c88b8d 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -10318,7 +10318,7 @@ public class CarrierConfigManager { sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, CellSignalStrengthLte.USE_RSRP); sDefaults.putInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT, 300); - sDefaults.putInt(KEY_PREFERRED_IKE_PROTOCOL_INT, 0); + sDefaults.putInt(KEY_PREFERRED_IKE_PROTOCOL_INT, -1); // Default wifi configurations. sDefaults.putAll(Wifi.getDefaults()); sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);