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

Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol" am: ec59bee3db am: a7083f38d2 am: 084f3b83eb

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

Change-Id: Ibd2c4bd336ca50c4310b5139cf1a63b7268413e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2023-03-20 04:33:59 +00:00
committed by Automerger Merge Worker
parent 0a18790656 084f3b83eb
commit c20b839c85
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3558,10 +3558,22 @@ public class Vpn {
+ mCurrentToken
+ " to network "
+ underlyingNetwork);
final int ipVersion = mProfile.isAutomaticIpVersionSelectionEnabled()
? guessEspIpVersionForNetwork() : ESP_IP_VERSION_AUTO;
final int encapType = mProfile.isAutomaticIpVersionSelectionEnabled()
? guessEspEncapTypeForNetwork() : ESP_ENCAP_TYPE_AUTO;
final int ipVersion;
final int encapType;
if (mProfile.isAutomaticIpVersionSelectionEnabled()) {
ipVersion = guessEspIpVersionForNetwork();
encapType = guessEspEncapTypeForNetwork();
} else if (mProfile.getIkeTunnelConnectionParams() != null) {
ipVersion = mProfile.getIkeTunnelConnectionParams()
.getIkeSessionParams().getIpVersion();
encapType = mProfile.getIkeTunnelConnectionParams()
.getIkeSessionParams().getEncapType();
} else {
ipVersion = ESP_IP_VERSION_AUTO;
encapType = ESP_ENCAP_TYPE_AUTO;
}
final int keepaliveDelaySeconds;
if (mProfile.isAutomaticNattKeepaliveTimerEnabled()) {
keepaliveDelaySeconds = guessNattKeepaliveTimerForNetwork();