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

Commit 564922c4 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Add more details to broadcastIntent trace events. 

Bug: 336385821
Test: manual
Flag: com.android.server.am.trace_receiver_registration
Change-Id: I8fb251e3d505571dfeec7ac8593415c16abe8e04
parent 1baf5540

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

+44 −9
Original line number Diff line number Diff line
@@ -15338,15 +15338,50 @@ public class ActivityManagerService extends IActivityManager.Stub 
            BackgroundStartPrivileges backgroundStartPrivileges,

            @Nullable int[] broadcastAllowList,

            @Nullable BiFunction<Integer, Bundle, Bundle> filterExtrasForReceiver) {

        final int cookie = BroadcastQueue.traceBegin("broadcastIntentLockedTraced");

        final int cookie = traceBroadcastIntentBegin(intent, resultTo, ordered, sticky,

                callingUid, realCallingUid, userId);

        try {

            final int res = broadcastIntentLockedTraced(callerApp, callerPackage, callerFeatureId,

                intent, resolvedType, resultToApp, resultTo, resultCode, resultData, resultExtras,

                requiredPermissions, excludedPermissions, excludedPackages, appOp,

                BroadcastOptions.fromBundleNullable(bOptions), ordered, sticky,

                    intent, resolvedType, resultToApp, resultTo, resultCode, resultData,

                    resultExtras, requiredPermissions, excludedPermissions, excludedPackages,

                    appOp, BroadcastOptions.fromBundleNullable(bOptions), ordered, sticky,

                    callingPid, callingUid, realCallingUid, realCallingPid, userId,

                    backgroundStartPrivileges, broadcastAllowList, filterExtrasForReceiver);

        BroadcastQueue.traceEnd(cookie);

            return res;

        } finally {

            traceBroadcastIntentEnd(cookie);

        }

    }













    private static int traceBroadcastIntentBegin(Intent intent, IIntentReceiver resultTo,













            boolean ordered, boolean sticky, int callingUid, int realCallingUid, int userId) {













        if (!Flags.traceReceiverRegistration()) {













            return BroadcastQueue.traceBegin("broadcastIntentLockedTraced");













        }













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













            final StringBuilder sb = new StringBuilder("broadcastIntent: ");













            sb.append(callingUid); sb.append('/');













            final String action = intent.getAction();













            sb.append(action == null ? null : action); sb.append('/');













            sb.append("0x"); sb.append(Integer.toHexString(intent.getFlags())); sb.append('/');













            sb.append(ordered ? "O" : "_");













            sb.append(sticky ? "S" : "_");













            sb.append(resultTo != null ? "C" : "_");













            sb.append('/');













            sb.append('u'); sb.append(userId);













            if (callingUid != realCallingUid) {













                sb.append('/');













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













            }













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













        }













        return 0;













    }

























    private static void traceBroadcastIntentEnd(int cookie) {













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













            BroadcastQueue.traceEnd(cookie);













        }















    }





























    @GuardedBy("this")