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

Commit 82e3f568 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Gerrit Code Review
Browse files

Revert^2 "Added trace event to broadcastIntentWithFeature." 

This reverts commit dc81d80a.

Reason for revert: Looks like a false positive to me

Change-Id: I6fb2755fd223f0dac063105c3a14bcda58db71ef
parent dc81d80a

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

+8 −0
Original line number Diff line number Diff line
@@ -15770,6 +15770,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            String[] excludedPackages, int appOp, Bundle bOptions,

            boolean serialized, boolean sticky, int userId) {

        enforceNotIsolatedCaller("broadcastIntent");















        synchronized(this) {















            intent = verifyBroadcastLocked(intent);























@@ -15783,6 +15784,12 @@ public class ActivityManagerService extends IActivityManager.Stub













            // 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 {















                return broadcastIntentLocked(callerApp,









@@ -15793,6 +15800,7 @@ public class ActivityManagerService extends IActivityManager.Stub













                        callingPid, userId, BackgroundStartPrivileges.NONE, null, null);















            } finally {















                Binder.restoreCallingIdentity(origId);













                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);















            }















        }















    }