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

Commit 2f0455aa authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Support Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am:... 

Merge "Support Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: a2ec01c7 am: b241c0a1 am: 050de9ff am: 60e060a4

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



Change-Id: I7e9e6cb377f3cc0013e468e1c2828f0bb57f06bf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7f241d06 60e060a4

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

+25 −4
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import android.net.ipsec.ike.ChildSessionParams; 
import android.net.ipsec.ike.IkeSession;

import android.net.ipsec.ike.IkeSessionCallback;

import android.net.ipsec.ike.IkeSessionParams;

import android.net.ipsec.ike.IkeTunnelConnectionParams;

import android.net.ipsec.ike.exceptions.IkeProtocolException;

import android.os.Binder;

import android.os.Build.VERSION_CODES;
@@ -2267,6 +2268,11 @@ public class Vpn { 
                profile.setAllowedAlgorithms(Ikev2VpnProfile.DEFAULT_ALGORITHMS);

                startVpnProfilePrivileged(profile, VpnConfig.LEGACY_VPN);

                return;

            case VpnProfile.TYPE_IKEV2_FROM_IKE_TUN_CONN_PARAMS:

                // All the necessary IKE options should come from IkeTunnelConnectionParams in the

                // profile.

                startVpnProfilePrivileged(profile, VpnConfig.LEGACY_VPN);

                return;

            case VpnProfile.TYPE_L2TP_IPSEC_PSK:

                racoon = new String[] {

                    iface, profile.server, "udppsk", profile.ipsecIdentifier,
@@ -2709,10 +2715,23 @@ public class Vpn { 
                    resetIkeState();

                    mActiveNetwork = network;



                    final IkeSessionParams ikeSessionParams =

                            VpnIkev2Utils.buildIkeSessionParams(mContext, mProfile, network);

                    final ChildSessionParams childSessionParams =

                            VpnIkev2Utils.buildChildSessionParams(mProfile.getAllowedAlgorithms());

                    // Get Ike options from IkeTunnelConnectionParams if it's available in the

                    // profile.

                    final IkeTunnelConnectionParams ikeTunConnParams =

                            mProfile.getIkeTunnelConnectionParams();

                    final IkeSessionParams ikeSessionParams;

                    final ChildSessionParams childSessionParams;

                    if (ikeTunConnParams != null) {

                        final IkeSessionParams.Builder builder = new IkeSessionParams.Builder(

                                ikeTunConnParams.getIkeSessionParams()).setNetwork(network);

                        ikeSessionParams = builder.build();

                        childSessionParams = ikeTunConnParams.getTunnelModeChildSessionParams();

                    } else {

                        ikeSessionParams = VpnIkev2Utils.buildIkeSessionParams(

                                mContext, mProfile, network);

                        childSessionParams = VpnIkev2Utils.buildChildSessionParams(

                                mProfile.getAllowedAlgorithms());

                    }



                    // TODO: Remove the need for adding two unused addresses with

                    // IPsec tunnels.
@@ -3233,6 +3252,7 @@ public class Vpn { 
            case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS:

            case VpnProfile.TYPE_IKEV2_IPSEC_PSK:

            case VpnProfile.TYPE_IKEV2_IPSEC_RSA:

            case VpnProfile.TYPE_IKEV2_FROM_IKE_TUN_CONN_PARAMS:

                if (!mContext.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_IPSEC_TUNNELS)) {

                    throw new UnsupportedOperationException(
@@ -3406,6 +3426,7 @@ public class Vpn { 
                case VpnProfile.TYPE_IKEV2_IPSEC_USER_PASS:

                case VpnProfile.TYPE_IKEV2_IPSEC_PSK:

                case VpnProfile.TYPE_IKEV2_IPSEC_RSA:

                case VpnProfile.TYPE_IKEV2_FROM_IKE_TUN_CONN_PARAMS:

                    mVpnRunner =

                            new IkeV2VpnRunner(Ikev2VpnProfile.fromVpnProfile(profile));

                    mVpnRunner.start();