summaryrefslogtreecommitdiff
path: root/services/java
diff options
context:
space:
mode:
author Nathan Harold <nharold@google.com> 2017-04-05 10:15:04 -0700
committer Nathan Harold <nharold@google.com> 2017-04-05 19:14:49 -0700
commit8f032dd16b45f30e1bc2ebd2b63f6d3fa0bc7382 (patch)
tree48ad38acb26391de3dd41dea8954cc18c7f57d61 /services/java
parent4fe5214231bd78b1b5b40ba5194567b130ea4df4 (diff)
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)
Diffstat (limited to 'services/java')
-rw-r--r--services/java/com/android/server/SystemServer.java14
1 files changed, 7 insertions, 7 deletions
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();