From: Nathan Harold <nharold@google.com>
Date: Wed, 5 Apr 2017 17:15:04 +0000 (-0700)
Subject: Fix Log Traces for IpSecService
X-Git-Tag: android-x86-8.1-r1~190^2~1141^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8f032dd16b45f30e1bc2ebd2b63f6d3fa0bc7382;p=android-x86%2Fframeworks-base.git

Fix Log Traces for IpSecService

Bug: 36920223
Test: boot and see full log
Change-Id: I1ac53f172094082c53b53a950058c862d257b7e5
(cherry picked from commit d3e3f1593a523d488c76be2494d94a399e52dc9d)
(cherry picked from commit a8a74e25ddb27a350c8f643590639b9131fae2e1)
---

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 4d5112f98771..63af2da93a86 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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();