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

Commit 43ef074d authored by ELIYAZ MOMIN's avatar ELIYAZ MOMIN Committed by Automerger Merge Worker
Browse files

Merge "Revert "Added trace event to broadcastIntentWithFeature."" into main... 

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

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



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

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

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























@@ -16303,12 +16302,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,









@@ -16319,7 +16312,6 @@ public class ActivityManagerService extends IActivityManager.Stub













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















            } finally {















                Binder.restoreCallingIdentity(origId);













                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);















            }















        }















    }