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

Commit dc81d80a authored by ELIYAZ MOMIN's avatar ELIYAZ MOMIN Committed by Gerrit Code Review
Browse files

Revert "Added trace event to broadcastIntentWithFeature." 

This reverts commit 2618484c.

Reason for revert: <Potential culprit for b/347868432  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.>

Change-Id: I3b45de90bbca32dd54e37c821739680d93c1274a
parent 2618484c

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

+0 −8
Original line number Diff line number Diff line
@@ -15770,7 +15770,6 @@ 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);























@@ -15784,12 +15783,6 @@ 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,









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













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















            } finally {















                Binder.restoreCallingIdentity(origId);













                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);















            }















        }















    }