Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" am: 37c9cdbd92 am: 059db69c50

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2608525

Change-Id: Ied14d9e3aea88e98e1bb3980de9c46332fa58970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-06-06 06:12:34 +00:00
committed by Automerger Merge Worker
parent 4df311c1cb 059db69c50
commit 002e6a1182
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -9281,7 +9281,7 @@ public class CarrierConfigManager {
sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT, sDefaults.putInt(KEY_PARAMETERS_USED_FOR_LTE_SIGNAL_BAR_INT,
CellSignalStrengthLte.USE_RSRP); CellSignalStrengthLte.USE_RSRP);
sDefaults.putInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT, 300); 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. // Default wifi configurations.
sDefaults.putAll(Wifi.getDefaults()); sDefaults.putAll(Wifi.getDefaults());
sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false); sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false);