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

Commit 432a04f4 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Android (Google) Code Review
Browse files

Merge "Add/enrich some trace points in ActivityThread"

parents 9ebb0ec4 118dc70f

core/java/android/app/ActivityThread.java

+31 −6
Original line number Diff line number Diff line
@@ -2251,12 +2251,18 @@ public final class ActivityThread extends ClientTransactionHandler 
                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case BIND_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceBind");

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

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceBind: "

                                + String.valueOf(msg.obj));

                    }

                    handleBindService((BindServiceData)msg.obj);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case UNBIND_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceUnbind");

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

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceUnbind: "

                                + String.valueOf(msg.obj));

                    }

                    handleUnbindService((BindServiceData)msg.obj);

                    schedulePurgeIdler();

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
@@ -2270,13 +2276,19 @@ public final class ActivityThread extends ClientTransactionHandler 
                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case STOP_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceStop");

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

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceStop: "

                                + String.valueOf(msg.obj));

                    }

                    handleStopService((IBinder)msg.obj);

                    schedulePurgeIdler();

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case TIMEOUT_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceTimeout");

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

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceTimeout: "

                                + String.valueOf(msg.obj));

                    }

                    handleTimeoutService((IBinder) msg.obj, msg.arg1);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;
@@ -2288,7 +2300,12 @@ public final class ActivityThread extends ClientTransactionHandler 
                    cci.context.performFinalCleanup(cci.who, cci.what);

                    break;

                case GC_WHEN_IDLE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "gcWhenIdle");

                    try {

                        scheduleGcIdler();

                    } finally {

                        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    }

                    break;

                case DUMP_SERVICE:

                    handleDumpService((DumpComponentInfo)msg.obj);
@@ -2365,7 +2382,15 @@ public final class ActivityThread extends ClientTransactionHandler 
                    handleTranslucentConversionComplete((IBinder)msg.obj, msg.arg1 == 1);

                    break;

                case INSTALL_PROVIDER:

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

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "providerInstall: "

                                + String.valueOf(msg.obj));

                    }

                    try {

                        handleInstallProvider((ProviderInfo) msg.obj);

                    } finally {

                        Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    }

                    break;

                case ON_NEW_ACTIVITY_OPTIONS:

                    Pair<IBinder, ActivityOptions> pair = (Pair<IBinder, ActivityOptions>) msg.obj;