From a62b4a79394a47922dacb66d7a0bdb1c9bb65075 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Mon, 1 Jun 2020 13:53:48 -0700 Subject: [PATCH] SystemServiceManager: fix boot time logging 1) add phase number to avoid duplicate entries 2) replace space with '_' for test parser Bug: 157930717 Test: Boot Change-Id: I2dde56d888bc43fcd893b8f1ff608a6da425ac65 --- .../core/java/com/android/server/SystemServiceManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/SystemServiceManager.java b/services/core/java/com/android/server/SystemServiceManager.java index 197a2cef0a62b..74bb7d7e90f18 100644 --- a/services/core/java/com/android/server/SystemServiceManager.java +++ b/services/core/java/com/android/server/SystemServiceManager.java @@ -198,12 +198,12 @@ public class SystemServiceManager { Slog.i(TAG, "Starting phase " + mCurrentPhase); try { - t.traceBegin("OnBootPhase " + phase); + t.traceBegin("OnBootPhase_" + phase); final int serviceLen = mServices.size(); for (int i = 0; i < serviceLen; i++) { final SystemService service = mServices.get(i); long time = SystemClock.elapsedRealtime(); - t.traceBegin("OnBootPhase " + service.getClass().getName()); + t.traceBegin("OnBootPhase_" + phase + "_" + service.getClass().getName()); try { service.onBootPhase(mCurrentPhase); } catch (Exception ex) { @@ -332,7 +332,7 @@ public class SystemServiceManager { } continue; } - t.traceBegin("ssm.on" + onWhat + "User-" + curUserId + " " + serviceName); + t.traceBegin("ssm.on" + onWhat + "User-" + curUserId + "_" + serviceName); long time = SystemClock.elapsedRealtime(); try { switch (onWhat) {