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

Commit 6cb27ac3 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" into udc-dev... 

Merge "Update default value of KEY_PREFERRED_IKE_PROTOCOL_INT" into udc-dev am: 91a777b5 am: a744d7ac

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



Change-Id: Ia5b70d1d573cbefa047173b00a29283ea4033c29
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7bc7ee03 a744d7ac

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);