Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Log bindService call and its service name in trace slices" into tm-dev am: f464d627a2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17039165

Change-Id: Ic14d593a1a8210a9c03732a47f4217dffd5fe146
This commit is contained in:
Jing Ji
2022-03-01 23:41:00 +00:00
committed by Automerger Merge Worker
parent fc41d3dc24 f464d627a2
commit a989e145d9
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -12426,10 +12426,19 @@ public class ActivityManagerService extends IActivityManager.Stub
} }
} }
synchronized(this) { try {
return mServices.bindServiceLocked(caller, token, service, resolvedType, connection, if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
flags, instanceName, isSdkSandboxService, sdkSandboxClientdAppUid, final ComponentName cn = service.getComponent();
callingPackage, userId); 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);
} }
} }