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

Commit 5601e883 authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'ipsec-merge-conflicts' into oc-dev-plus-aosp 

* changes:
  Fix Log Traces for IpSecService
  SystemServer: fix StartIpSecService trace and log
parents 9dbed5d1 8f032dd1

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

+8 −8
Original line number Diff line number Diff line
@@ -1024,7 +1024,7 @@ public final class SystemServer { 
                } catch (Throwable e) {

                    reportWtf("starting IpSec Service", e);

                }

                Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

                traceEnd();

            }



            if (!disableNonCoreServices && !disableTextServices) {
@@ -1696,19 +1696,19 @@ public final class SystemServer { 
            } catch (Throwable e) {

                reportWtf("making Network Managment Service ready", e);

            }

            Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, "MakeIpSecServiceReady");

            try {

                if (ipSecServiceF != null) ipSecServiceF.systemReady();

            } catch (Throwable e) {

                reportWtf("making IpSec Service ready", e);

            }

            Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

            CountDownLatch networkPolicyInitReadySignal = null;

            if (networkPolicyF != null) {

                networkPolicyInitReadySignal = networkPolicyF

                        .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();