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

Commit 80e712c7 authored by ELIYAZ MOMIN's avatar ELIYAZ MOMIN Committed by Automerger Merge Worker
Browse files

Merge "Revert "Added trace event to broadcastIntentWithFeature."" into main am: c4cb9057 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3133277



Change-Id: Ie06827141ab24452906d80c8252064470246637a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79418ce6 c4cb9057

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

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























@@ -15923,12 +15922,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,









@@ -15939,7 +15932,6 @@ public class ActivityManagerService extends IActivityManager.Stub













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















            } finally {















                Binder.restoreCallingIdentity(origId);













                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);















            }















        }















    }