summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chiachang Wang <chiachangwang@google.com> 2023-06-09 01:10:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-09 01:10:06 +0000
commit6cb27ac331ee1912ce2103a9ffc11c229d9a1ffe (patch)
treec3a59d03afe8d9d2e86b2afac0488066c6ced693
parent7bc7ee036979472e23a3eb9d86c5163b92531ea3 (diff)
parenta744d7ac2ae4b9d25c168522961a515e826f3c9d (diff)
Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" into udc-dev am: 91a777b5a2 am: a744d7ac2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23579529 Change-Id: Ia5b70d1d573cbefa047173b00a29283ea4033c29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--telephony/java/android/telephony/CarrierConfigManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index 188894339f6a..5b1c6b1c88b8 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);