From eb839e7dfbef7043da79bc0d68d8d5c337e01f7f Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Mon, 10 Oct 2022 10:04:01 -0700 Subject: [PATCH] Log the canonical path of the broadcast in statsd As we're reducing the dimensions of the metrics. Bug: 252642522 Test: statsd_drive Change-Id: I13e8211dd3127fc2a7740463a73a1d33b5efb53a --- .../core/java/com/android/server/am/BroadcastQueueImpl.java | 4 ++-- .../java/com/android/server/am/BroadcastQueueModernImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/am/BroadcastQueueImpl.java b/services/core/java/com/android/server/am/BroadcastQueueImpl.java index 77300f7cf228a..d7a075b3b9666 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueImpl.java @@ -579,7 +579,7 @@ public class BroadcastQueueImpl extends BroadcastQueue { final Object curReceiver = r.receivers.get(curIndex); FrameworkStatsLog.write(BROADCAST_DELIVERY_EVENT_REPORTED, r.curApp.uid, r.callingUid == -1 ? Process.SYSTEM_UID : r.callingUid, - ActivityManagerService.getShortAction(r.intent.getAction()), + r.intent.getAction(), curReceiver instanceof BroadcastFilter ? BROADCAST_DELIVERY_EVENT_REPORTED__RECEIVER_TYPE__RUNTIME : BROADCAST_DELIVERY_EVENT_REPORTED__RECEIVER_TYPE__MANIFEST, @@ -757,7 +757,7 @@ public class BroadcastQueueImpl extends BroadcastQueue { FrameworkStatsLog.write(BROADCAST_DELIVERY_EVENT_REPORTED, receiverUid == -1 ? Process.SYSTEM_UID : receiverUid, callingUid == -1 ? Process.SYSTEM_UID : callingUid, - ActivityManagerService.getShortAction(intent.getAction()), + intent.getAction(), BROADCAST_DELIVERY_EVENT_REPORTED__RECEIVER_TYPE__RUNTIME, BROADCAST_DELIVERY_EVENT_REPORTED__PROC_START_TYPE__PROCESS_START_TYPE_WARM, dispatchDelay, receiveDelay, 0 /* finish_delay */); diff --git a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java index fe8d84feb5570..89a0283a4264f 100644 --- a/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java +++ b/services/core/java/com/android/server/am/BroadcastQueueModernImpl.java @@ -1298,7 +1298,7 @@ class BroadcastQueueModernImpl extends BroadcastQueue { // Report statistics for each individual receiver final int uid = getReceiverUid(receiver); final int senderUid = (r.callingUid == -1) ? Process.SYSTEM_UID : r.callingUid; - final String actionName = ActivityManagerService.getShortAction(r.intent.getAction()); + final String actionName = r.intent.getAction(); final int receiverType = (receiver instanceof BroadcastFilter) ? BROADCAST_DELIVERY_EVENT_REPORTED__RECEIVER_TYPE__RUNTIME : BROADCAST_DELIVERY_EVENT_REPORTED__RECEIVER_TYPE__MANIFEST;