summaryrefslogtreecommitdiff
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2022-02-07 19:00:23 -0800
committerTim Murray <timmurray@google.com>2022-02-08 17:10:09 -0800
commit291dc44ee940a623e699ba53e9bc230b152c73dc (patch)
tree1e388918216c2443e57af949a4faca08cfbed8dd /core/java/android/app/ActivityThread.java
parentb45c44cb17e9ac8536fa0702aa89348bbf616ff4 (diff)
Improve broadcast tracing
Include the name of the broadcast that is being handled in the tracepoint for receivers registered both at runtime and in the manifest. Test: TH, traces Bug: 208747905 Change-Id: I624cd434c5066296e55f4c8bb8c46de65bfe635c
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 5b8969e9374e..61d186579f1b 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -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;