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

Commit 60068875 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Added trace event to broadcastIntentWithFeature."" into main am: 4c70fa92 

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



Change-Id: I1ff51eb9407b8276ae94ae1b5f37c20278aa78a5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 80e712c7 4c70fa92

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

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























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









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













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















            } finally {















                Binder.restoreCallingIdentity(origId);













                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);















            }















        }















    }