From 508fb03d64793d11a09412153b34480d6c5fcb7d Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Mon, 28 Feb 2022 16:52:41 -0800 Subject: [PATCH] Log bindService call and its service name in trace slices Bug: 218323803 Test: Manual - capture perfetto traces. Change-Id: Id73ea29cde37ddf12ed8e71b1761b49c18891503 --- .../server/am/ActivityManagerService.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 3302cfb9bd66a..f659b6c7a0fd3 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -12426,10 +12426,19 @@ public class ActivityManagerService extends IActivityManager.Stub } } - synchronized(this) { - return mServices.bindServiceLocked(caller, token, service, resolvedType, connection, - flags, instanceName, isSdkSandboxService, sdkSandboxClientdAppUid, - callingPackage, userId); + try { + if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) { + final ComponentName cn = service.getComponent(); + Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "bindService:" + + (cn != null ? cn.toShortString() : service.getAction())); + } + synchronized (this) { + return mServices.bindServiceLocked(caller, token, service, resolvedType, connection, + flags, instanceName, isSdkSandboxService, sdkSandboxClientdAppUid, + callingPackage, userId); + } + } finally { + Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER); } }