Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52a04909 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" am: 37c9cdbd... 

Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" am: 37c9cdbd am: 059db69c am: 002e6a11 am: 99306dca

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



Change-Id: I47e86cb230e63c9fefd3f5dc0a03b91b0ad01daa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18e4bbc2 99306dca

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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);