LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I852e3a53,I86755647,I0ed8b0c6 am: 3e0c976af8 am: 9fcdfe35c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic520c715578c8c5dd70040bbdc4c535330b0a453
This commit is contained in:
Lucas Lin
2021-02-23 22:46:54 +00:00
committed by Automerger Merge Worker
parent 74f56497f7 9fcdfe35c5
commit d1912febe9
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
services/core/java/com/android/server/IpSecService.java
View File

@@ -48,7 +48,6 @@ import android.net.TrafficStats;
import android.net.util.NetdService; import android.net.util.NetdService;
import android.os.Binder; import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.os.INetworkManagementService;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
@@ -64,6 +63,7 @@ import android.util.SparseBooleanArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.net.module.util.NetdUtils;
import libcore.io.IoUtils; import libcore.io.IoUtils;
@@ -117,9 +117,6 @@ public class IpSecService extends IIpSecService.Stub {
/* Binder context for this service */ /* Binder context for this service */
private final Context mContext; private final Context mContext;
/* NetworkManager instance */
private final INetworkManagementService mNetworkManager;
/** /**
* The next non-repeating global ID for tracking resources between users, this service, and * The next non-repeating global ID for tracking resources between users, this service, and
* kernel data structures. Accessing this variable is not thread safe, so it is only read or * kernel data structures. Accessing this variable is not thread safe, so it is only read or
@@ -1014,13 +1011,13 @@ public class IpSecService extends IIpSecService.Stub {
* *
* @param context Binder context for this service * @param context Binder context for this service
*/ */
private IpSecService(Context context, INetworkManagementService networkManager) { private IpSecService(Context context) {
this(context, networkManager, IpSecServiceConfiguration.GETSRVINSTANCE); this(context, IpSecServiceConfiguration.GETSRVINSTANCE);
} }
static IpSecService create(Context context, INetworkManagementService networkManager) static IpSecService create(Context context)
throws InterruptedException { throws InterruptedException {
final IpSecService service = new IpSecService(context, networkManager); final IpSecService service = new IpSecService(context);
service.connectNativeNetdService(); service.connectNativeNetdService();
return service; return service;
} }
@@ -1034,11 +1031,9 @@ public class IpSecService extends IIpSecService.Stub {
/** @hide */ /** @hide */
@VisibleForTesting @VisibleForTesting
public IpSecService(Context context, INetworkManagementService networkManager, public IpSecService(Context context, IpSecServiceConfiguration config) {
IpSecServiceConfiguration config) {
this( this(
context, context,
networkManager,
config, config,
(fd, uid) -> { (fd, uid) -> {
try { try {
@@ -1052,10 +1047,9 @@ public class IpSecService extends IIpSecService.Stub {
/** @hide */ /** @hide */
@VisibleForTesting @VisibleForTesting
public IpSecService(Context context, INetworkManagementService networkManager, public IpSecService(Context context, IpSecServiceConfiguration config,
IpSecServiceConfiguration config, UidFdTagger uidFdTagger) { UidFdTagger uidFdTagger) {
mContext = context; mContext = context;
mNetworkManager = Objects.requireNonNull(networkManager);
mSrvConfig = config; mSrvConfig = config;
mUidFdTagger = uidFdTagger; mUidFdTagger = uidFdTagger;
} }
@@ -1335,7 +1329,7 @@ public class IpSecService extends IIpSecService.Stub {
netd.ipSecAddTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey, resourceId); netd.ipSecAddTunnelInterface(intfName, localAddr, remoteAddr, ikey, okey, resourceId);
Binder.withCleanCallingIdentity(() -> { Binder.withCleanCallingIdentity(() -> {
mNetworkManager.setInterfaceUp(intfName); NetdUtils.setInterfaceUp(netd, intfName);
}); });
for (int selAddrFamily : ADDRESS_FAMILIES) { for (int selAddrFamily : ADDRESS_FAMILIES) {