Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev am: 72cdc9cdae (e1612d04) · Commits · e / os / android_frameworks_base

services/java/com/android/server/SystemServer.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -677,7 +677,6 @@ public final class SystemServer {
		VibratorService vibrator = null;
		IStorageManager storageManager = null;
		NetworkManagementService networkManagement = null;
		IpSecService ipSecService = null;
		NetworkStatsService networkStats = null;
		NetworkPolicyManagerService networkPolicy = null;
		ConnectivityService connectivity = null;
		@@ -1035,15 +1034,6 @@ public final class SystemServer {
		reportWtf("starting NetworkManagement Service", e);
		}
		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) {
		@@ -1669,7 +1659,6 @@ public final class SystemServer {
		final TelephonyRegistry telephonyRegistryF = telephonyRegistry;
		final MediaRouterService mediaRouterF = mediaRouter;
		final MmsServiceBroker mmsServiceF = mmsService;
		final IpSecService ipSecServiceF = ipSecService;
		final WindowManagerService windowManagerF = wm;

		// We now tell the activity manager it is okay to run third party
		@@ -1734,13 +1723,6 @@ public final class SystemServer {
		.networkScoreAndNetworkManagementServiceReady();
		}
		traceEnd();
		traceBeginAndSlog("MakeIpSecServiceReady");
		try {
		if (ipSecServiceF != null) ipSecServiceF.systemReady();
		} catch (Throwable e) {
		reportWtf("making IpSec Service ready", e);
		}
		traceEnd();
		traceBeginAndSlog("MakeNetworkStatsServiceReady");
		try {
		if (networkStatsF != null) networkStatsF.systemReady();