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

Merge changes I852e3a53,I86755647,I0ed8b0c6

Browse Source 
* changes:
  Remove unused INetworkManagementService from IpSecService
  Use NetdUtils instead of NetworkManagementService in Vpn
  Use NetdUtils instead of NetworkManagementService in IpSecService
This commit is contained in:
Lucas Lin
2021-02-22 06:49:39 +00:00
committed by Gerrit Code Review
parent 9203e5b94a 2b9ba7a1f6
commit 654b0fff63
7 changed files with 55 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/SystemServer.java
View File

@@ -1534,7 +1534,7 @@ public final class SystemServer {
t.traceBegin("StartIpSecService");
try {
ipSecService = IpSecService.create(context, networkManagement);
ipSecService = IpSecService.create(context);
ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService);
} catch (Throwable e) {
reportWtf("starting IpSec Service", e);