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

Commit a9a0b5b7 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "Improve broadcast tracing"

parents 63ae30e1 291dc44e

core/java/android/app/ActivityThread.java

+10 −1
Original line number Diff line number Diff line
@@ -2132,7 +2132,16 @@ public final class ActivityThread extends ClientTransactionHandler 
                    Looper.myLooper().quit();

                    break;

                case RECEIVER:

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

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

                        ReceiverData rec = (ReceiverData) msg.obj;

                        if (rec.intent != null) {

                            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                                    "broadcastReceiveComp: " + rec.intent.getAction());

                        } else {

                            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                                    "broadcastReceiveComp");

                        }

                    }

                    handleReceiver((ReceiverData)msg.obj);

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

core/java/android/app/LoadedApk.java

+5 −1
Original line number Diff line number Diff line
@@ -1734,7 +1734,11 @@ public final class LoadedApk { 
                        return;

                    }



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

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

                        Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER,

                                "broadcastReceiveReg: " + intent.getAction());

                    }



                    try {

                        ClassLoader cl = mReceiver.getClass().getClassLoader();

                        intent.setExtrasClassLoader(cl);