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

Commit 686a8282 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Re-Enable Starting of the IpSecService am: b7282174 

am: f434a6d3

Change-Id: I328841b57df6f216c0e4b0aa0c1df923c606a885
parents c03209d4 f434a6d3

core/java/android/net/IpSecAlgorithm.java

+2 −0
Original line number Diff line number Diff line
@@ -19,7 +19,9 @@ import android.annotation.StringDef; 
import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.util.HexDump;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

core/java/android/net/IpSecManager.java

+2 −0
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ import android.os.ParcelFileDescriptor; 
import android.os.RemoteException;

import android.util.AndroidException;

import android.util.Log;



import dalvik.system.CloseGuard;



import java.io.FileDescriptor;

import java.io.IOException;

import java.net.DatagramSocket;

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

+18 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ 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;
@@ -1026,6 +1027,15 @@ 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) {
@@ -1644,6 +1654,7 @@ 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
@@ -1714,6 +1725,13 @@ 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();