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

Commit f464d627 authored by Jing Ji's avatar Jing Ji Committed by Android (Google) Code Review
Browse files

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

parents 837736b6 508fb03d

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

+13 −4
Original line number Diff line number Diff line
@@ -12426,11 +12426,20 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }

        }













        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);













        }















    }





























    public void updateServiceGroup(IServiceConnection connection, int group, int importance) {