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

Commit 31bdcbcb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "SystemServiceManager: fix boot time logging" into rvc-dev am: 7154ce11 

Original change: undetermined

Change-Id: Id7eb25c0337d08d9bbed167976facadf5472a9aa
parents 6ef0f44c 7154ce11

services/core/java/com/android/server/SystemServiceManager.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {