commit c4cb9057adc83dc111e601a548ccbdcb51321d4d
author ELIYAZ MOMIN <mohammedeliyaz@google.com> Tue Jun 18 16:46:26 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 18 16:46:26 2024 +0000
tree ef211e0174f2bdbfcb0dab08938ab5b39d5b6bf6
parent fd59e29077197ae82da869f2c85adc1a94fdf6a0
parent dc81d80a11ad4ed4070f9cd867e2508a607bd313

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

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 30b1c6f..796dc77 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -15909,7 +15909,6 @@
             String[] excludedPackages, int appOp, Bundle bOptions,
             boolean serialized, boolean sticky, int userId) {
         enforceNotIsolatedCaller("broadcastIntent");
-
         synchronized(this) {
             intent = verifyBroadcastLocked(intent);
 
@@ -15923,12 +15922,6 @@
             // 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 @@
                         callingPid, userId, BackgroundStartPrivileges.NONE, null, null);
             } finally {
                 Binder.restoreCallingIdentity(origId);
-                Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
             }
         }
     }