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

Commit a7e6eed1 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Emit trace events to identify broadcast recipient. 

Bug: 421209358
Test: manual
Flag: EXEMPT updates trace log
Change-Id: Id3d1c826dce3aa60496182df9de183e674e3527e
parent ab56d4f2

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

+4 −7
Original line number Diff line number Diff line
@@ -728,12 +728,6 @@ class BroadcastController { 
            // Permission regimes around sender-supplied broadcast options.

            enforceBroadcastOptionPermissionsInternal(bOptions, callingUid);



            final ComponentName cn = intent.getComponent();



            Trace.traceBegin(

                    Trace.TRACE_TAG_ACTIVITY_MANAGER,

                    "broadcastIntent:" + (cn != null ? cn.toString() : intent.getAction()));



            final long origId = Binder.clearCallingIdentity();

            try {

                result = broadcastIntentLocked(callerApp,
@@ -744,7 +738,6 @@ class BroadcastController { 
                        callingPid, userId, BackgroundStartPrivileges.NONE, null, null);

            } finally {

                Binder.restoreCallingIdentity(origId);

                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

            }

        }
@@ -838,6 +831,10 @@ class BroadcastController { 
                sb.append('/');

                sb.append("sender="); sb.append(realCallingUid);

            }

            final String target = intent.getComponent() != null

                    ? intent.getComponent().flattenToShortString()

                    : intent.getPackage();

            Trace.instant(Trace.TRACE_TAG_ACTIVITY_MANAGER, "broadcastIntentTarget:" + target);

            return BroadcastQueue.traceBegin(sb.toString());

        }

        return 0;