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

Commit 5492cf57 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol" am:... 

Merge changes from topics "nonAutoIPSelection", "preferredIpProtocol" am: ec59bee3 am: a7083f38 am: 084f3b83 am: c20b839c am: d0f3055b

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



Change-Id: I8a4d63d201228fe0305f7dbfe629796d129cced1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18334ac7 d0f3055b

services/core/java/com/android/server/connectivity/Vpn.java

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