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

Commit c0ec31e9 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

Merge "Log the canonical path of the broadcast in statsd"

parents 67a16034 eb839e7d

services/core/java/com/android/server/am/BroadcastQueueImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -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 */);

services/core/java/com/android/server/am/BroadcastQueueModernImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -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;