Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41004ff4 authored by Nathan Harold's avatar Nathan Harold
Browse files

[DO NOT MERGE] Do not start the IpSecService 

Bug: 37688915
Test: build+boot marlin
Change-Id: I69635c832ac64104d753735a3e22f0442b0fa910
parent c1affe14

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

+0 −18
Original line number Diff line number Diff line
@@ -671,7 +671,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;
@@ -1024,15 +1023,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) {
@@ -1643,7 +1633,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
@@ -1708,13 +1697,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();