Merge "Merge "Revert^2 "Added trace event to broadcastIntentWithFeature.""... (0eaf4ed5) · Commits · e / os / android_frameworks_base

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

+8 −0

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

		@@ -16302,6 +16303,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,
		@@ -16312,6 +16319,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		callingPid, userId, BackgroundStartPrivileges.NONE, null, null);
		} finally {
		Binder.restoreCallingIdentity(origId);
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}
		}
		}