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

Commit a0cb82f7 authored by lucaslin's avatar lucaslin
Browse files

Address leftover comments of ag/18108411 

Bug: 229799060
Test: atest FrameworksNetTests:VpnTest
Change-Id: Iade04ede17b9371e530556acb2bd84c4b57c1581
parent 92891b4b

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

+0 −2
Original line number Diff line number Diff line
@@ -2650,8 +2650,6 @@ public class Vpn { 
            super(TAG);

            mProfile = profile;

            mIpSecManager = (IpSecManager) mContext.getSystemService(Context.IPSEC_SERVICE);

            // Pass mExecutor into Ikev2VpnNetworkCallback and make sure that IkeV2VpnRunnerCallback

            // will be called by the mExecutor thread.

            mNetworkCallback = new VpnIkev2Utils.Ikev2VpnNetworkCallback(TAG, this, mExecutor);

            mSessionKey = UUID.randomUUID().toString();

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ import java.util.Arrays; 
import java.util.Collection;

import java.util.HashSet;

import java.util.List;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executor;



/**

 * Utility class to build and convert IKEv2/IPsec parameters.
@@ -379,10 +379,10 @@ public class VpnIkev2Utils { 
    static class Ikev2VpnNetworkCallback extends NetworkCallback {

        private final String mTag;

        private final Vpn.IkeV2VpnRunnerCallback mCallback;

        private final ExecutorService mExecutor;

        private final Executor mExecutor;



        Ikev2VpnNetworkCallback(String tag, Vpn.IkeV2VpnRunnerCallback callback,

                ExecutorService executor) {

                Executor executor) {

            mTag = tag;

            mCallback = callback;

            mExecutor = executor;