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

Merge "Use PersistableBundle.getInt(String, int) with default value parameter" am: a4bef297e8

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

Change-Id: I621b8ef67879d1f0712229581e446374e160f08f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-05-30 02:15:34 +00:00
committed by Automerger Merge Worker
parent 21d92f04bf a4bef297e8
commit ea0a395bec
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -309,6 +309,8 @@ public class Vpn {
*/ */
@VisibleForTesting @VisibleForTesting
static final int DEFAULT_LONG_LIVED_TCP_CONNS_EXPENSIVE_TIMEOUT_SEC = 60; static final int DEFAULT_LONG_LIVED_TCP_CONNS_EXPENSIVE_TIMEOUT_SEC = 60;
private static final int PREFERRED_IKE_PROTOCOL_UNKNOWN = -1;
/** /**
* Prefer using {@link IkeSessionParams.ESP_IP_VERSION_AUTO} and * Prefer using {@link IkeSessionParams.ESP_IP_VERSION_AUTO} and
* {@link IkeSessionParams.ESP_ENCAP_TYPE_AUTO} for ESP packets. * {@link IkeSessionParams.ESP_ENCAP_TYPE_AUTO} for ESP packets.
@@ -3643,11 +3645,11 @@ public class Vpn {
final int natKeepalive = final int natKeepalive =
carrierConfig.getInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT); carrierConfig.getInt(KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT);
final int preferredIpPortocol = final int preferredIpProtocol = carrierConfig.getInt(
carrierConfig.getInt(KEY_PREFERRED_IKE_PROTOCOL_INT); KEY_PREFERRED_IKE_PROTOCOL_INT, PREFERRED_IKE_PROTOCOL_UNKNOWN);
final String mccMnc = perSubTm.getSimOperator(subId); final String mccMnc = perSubTm.getSimOperator(subId);
final CarrierConfigInfo info = final CarrierConfigInfo info =
buildCarrierConfigInfo(mccMnc, natKeepalive, preferredIpPortocol); buildCarrierConfigInfo(mccMnc, natKeepalive, preferredIpProtocol);
synchronized (Vpn.this) { synchronized (Vpn.this) {
mCachedCarrierConfigInfoPerSubId.put(subId, info); mCachedCarrierConfigInfoPerSubId.put(subId, info);
} }