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

Merge changes from topic "vpnmanager-events-T" into tm-dev am: 839756e661

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

Change-Id: I88e626932d47223ab592eb049c5e458b9b152ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lorenzo Colitti
2022-06-02 11:03:20 +00:00
committed by Automerger Merge Worker
parent 521df6a11a 839756e661
commit 1f55532c3e
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2655,8 +2655,6 @@ public class Vpn {
super(TAG); super(TAG);
mProfile = profile; mProfile = profile;
mIpSecManager = (IpSecManager) mContext.getSystemService(Context.IPSEC_SERVICE); 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); mNetworkCallback = new VpnIkev2Utils.Ikev2VpnNetworkCallback(TAG, this, mExecutor);
mSessionKey = UUID.randomUUID().toString(); mSessionKey = UUID.randomUUID().toString();
} }

6
services/core/java/com/android/server/connectivity/VpnIkev2Utils.java
View File

@@ -88,7 +88,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutorService; import java.util.concurrent.Executor;
/** /**
* Utility class to build and convert IKEv2/IPsec parameters. * Utility class to build and convert IKEv2/IPsec parameters.
@@ -379,10 +379,10 @@ public class VpnIkev2Utils {
static class Ikev2VpnNetworkCallback extends NetworkCallback { static class Ikev2VpnNetworkCallback extends NetworkCallback {
private final String mTag; private final String mTag;
private final Vpn.IkeV2VpnRunnerCallback mCallback; private final Vpn.IkeV2VpnRunnerCallback mCallback;
private final ExecutorService mExecutor; private final Executor mExecutor;
Ikev2VpnNetworkCallback(String tag, Vpn.IkeV2VpnRunnerCallback callback, Ikev2VpnNetworkCallback(String tag, Vpn.IkeV2VpnRunnerCallback callback,
ExecutorService executor) { Executor executor) {
mTag = tag; mTag = tag;
mCallback = callback; mCallback = callback;
mExecutor = executor; mExecutor = executor;