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>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user