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

Commit 928f511e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't create string temporaries if tracing isn't enabled"

parents e6c910d5 e48e6dac

core/java/android/app/ActivityThread.java

+8 −2
Original line number Diff line number Diff line
@@ -1871,7 +1871,10 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case CREATE_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, ("serviceCreate: " + String.valueOf(msg.obj)));

                    if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                                ("serviceCreate: " + String.valueOf(msg.obj)));

                    }

                    handleCreateService((CreateServiceData)msg.obj);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;
@@ -1887,7 +1890,10 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case SERVICE_ARGS:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, ("serviceStart: " + String.valueOf(msg.obj)));

                    if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                                ("serviceStart: " + String.valueOf(msg.obj)));

                    }

                    handleServiceArgs((ServiceArgsData)msg.obj);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;