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

Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev

Browse Source
This commit is contained in:
Nathan Harold
2017-05-24 21:36:15 +00:00
committed by Android (Google) Code Review
parent 4e962321ad 41004ff411
commit 72cdc9cdae
1 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -671,7 +671,6 @@ public final class SystemServer {
VibratorService vibrator = null; VibratorService vibrator = null;
IStorageManager storageManager = null; IStorageManager storageManager = null;
NetworkManagementService networkManagement = null; NetworkManagementService networkManagement = null;
IpSecService ipSecService = null;
NetworkStatsService networkStats = null; NetworkStatsService networkStats = null;
NetworkPolicyManagerService networkPolicy = null; NetworkPolicyManagerService networkPolicy = null;
ConnectivityService connectivity = null; ConnectivityService connectivity = null;
@@ -1024,15 +1023,6 @@ public final class SystemServer {
reportWtf("starting NetworkManagement Service", e); reportWtf("starting NetworkManagement Service", e);
} }
traceEnd(); traceEnd();
traceBeginAndSlog("StartIpSecService");
try {
ipSecService = IpSecService.create(context);
ServiceManager.addService(Context.IPSEC_SERVICE, ipSecService);
} catch (Throwable e) {
reportWtf("starting IpSec Service", e);
}
traceEnd();
} }
if (!disableNonCoreServices && !disableTextServices) { if (!disableNonCoreServices && !disableTextServices) {
@@ -1643,7 +1633,6 @@ public final class SystemServer {
final TelephonyRegistry telephonyRegistryF = telephonyRegistry; final TelephonyRegistry telephonyRegistryF = telephonyRegistry;
final MediaRouterService mediaRouterF = mediaRouter; final MediaRouterService mediaRouterF = mediaRouter;
final MmsServiceBroker mmsServiceF = mmsService; final MmsServiceBroker mmsServiceF = mmsService;
final IpSecService ipSecServiceF = ipSecService;
final WindowManagerService windowManagerF = wm; final WindowManagerService windowManagerF = wm;
// We now tell the activity manager it is okay to run third party // We now tell the activity manager it is okay to run third party
@@ -1708,13 +1697,6 @@ public final class SystemServer {
.networkScoreAndNetworkManagementServiceReady(); .networkScoreAndNetworkManagementServiceReady();
} }
traceEnd(); traceEnd();
traceBeginAndSlog("MakeIpSecServiceReady");
try {
if (ipSecServiceF != null) ipSecServiceF.systemReady();
} catch (Throwable e) {
reportWtf("making IpSec Service ready", e);
}
traceEnd();
traceBeginAndSlog("MakeNetworkStatsServiceReady"); traceBeginAndSlog("MakeNetworkStatsServiceReady");
try { try {
if (networkStatsF != null) networkStatsF.systemReady(); if (networkStatsF != null) networkStatsF.systemReady();