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

Merge "Split out the ipsec API surface and use framework-connectivity-tiramisu" am: 5edd77be5c am: 7dc8a7f592 am: 56313350b5

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

Change-Id: I4b7122a3b2cee5b53b039288ab164604a917edb1
This commit is contained in:
Treehugger Robot
2022-02-10 12:44:54 +00:00
committed by Automerger Merge Worker
parent 5acb0b1646 56313350b5
commit c268c99376
12 changed files with 12 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1336,7 +1336,6 @@ public final class SystemServer implements Dumpable {
DynamicSystemService dynamicSystem = null;
IStorageManager storageManager = null;
NetworkManagementService networkManagement = null;
IpSecService ipSecService = null;
VpnManagerService vpnManager = null;
VcnManagementService vcnManagement = null;
NetworkStatsService networkStats = null;
@@ -1811,16 +1810,6 @@ public final class SystemServer implements Dumpable {
}
t.traceEnd();
t.traceBegin("StartIpSecService");
try {
ipSecService = IpSecService.create(context);
ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService);
} catch (Throwable e) {
reportWtf("starting IpSec Service", e);
}
t.traceEnd();
t.traceBegin("StartFontManagerService");
mSystemServiceManager.startService(new FontManagerService.Lifecycle(context, safeMode));
t.traceEnd();
@@ -2676,7 +2665,6 @@ public final class SystemServer implements Dumpable {
final TelephonyRegistry telephonyRegistryF = telephonyRegistry;
final MediaRouterService mediaRouterF = mediaRouter;
final MmsServiceBroker mmsServiceF = mmsService;
final IpSecService ipSecServiceF = ipSecService;
final VpnManagerService vpnManagerF = vpnManager;
final VcnManagementService vcnManagementF = vcnManagement;
final WindowManagerService windowManagerF = wm;
@@ -2766,15 +2754,6 @@ public final class SystemServer implements Dumpable {
.networkScoreAndNetworkManagementServiceReady();
}
t.traceEnd();
t.traceBegin("MakeIpSecServiceReady");
try {
if (ipSecServiceF != null) {
ipSecServiceF.systemReady();
}
} catch (Throwable e) {
reportWtf("making IpSec Service ready", e);
}
t.traceEnd();
t.traceBegin("MakeNetworkStatsServiceReady");
try {
if (networkStatsF != null) {