Merge "Add tracepoints for process starts" (7549cfd3) · Commits · e / os / android_frameworks_base

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

+12 −4

Original line number	Diff line number	Diff line
		@@ -17925,11 +17925,19 @@ public class ActivityManagerService extends IActivityManager.Stub
		@Override
		public void startProcess(String processName, ApplicationInfo info,
		boolean knownToBeDead, String hostingType, ComponentName hostingName) {
		try {
		if (Trace.isTagEnabled(Trace.TRACE_TAG_ACTIVITY_MANAGER)) {
		Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "startProcess:"
		+ processName);
		}
		synchronized (ActivityManagerService.this) {
		startProcessLocked(processName, info, knownToBeDead, 0 /* intentFlags */,
		hostingType, hostingName, false /* allowWhileBooting */,
		false /* isolated /, true / keepIfLarge */);
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		@Override

+14 −6

Original line number	Diff line number	Diff line
		@@ -978,12 +978,20 @@ public class ActivityStackSupervisor implements RecentTasks.Callbacks {
		r.notifyUnknownVisibilityLaunched();
		}

		try {
		if (Trace.isTagEnabled(TRACE_TAG_ACTIVITY_MANAGER)) {
		Trace.traceBegin(TRACE_TAG_ACTIVITY_MANAGER, "dispatchingStartProcess:"
		+ r.processName);
		}
		// Post message to start process to avoid possible deadlock of calling into AMS with the
		// ATMS lock held.
		final Message msg = PooledLambda.obtainMessage(
		ActivityManagerInternal::startProcess, mService.mAmInternal, r.processName,
		r.info.applicationInfo, knownToBeDead, "activity", r.intent.getComponent());
		mService.mH.sendMessage(msg);
		} finally {
		Trace.traceEnd(TRACE_TAG_ACTIVITY_MANAGER);
		}
		}

		boolean checkStartAnyActivityPermission(Intent intent, ActivityInfo aInfo, String resultWho,