Merge "Tracing for unaccounted parts" (8e514b78) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -215,6 +215,7 @@ import android.text.style.SuggestionSpan;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		import android.util.AtomicFile;
		import android.util.BootTimingsTraceLog;
		import android.util.DebugUtils;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		@@ -13206,7 +13207,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		public void systemReady(final Runnable goingCallback) {
		public void systemReady(final Runnable goingCallback, BootTimingsTraceLog traceLog) {
		traceLog.traceBegin("PhaseActivityManagerReady");
		synchronized(this) {
		if (mSystemReady) {
		// If we're done calling all the receivers, run the next "boot phase" passed in
		@@ -13303,7 +13305,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		if (goingCallback != null) goingCallback.run();

		traceLog.traceBegin("ActivityManagerStartApps");
		mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_RUNNING_START,
		Integer.toString(currentUserId), currentUserId);
		mBatteryStatsService.noteEvent(BatteryStats.HistoryItem.EVENT_USER_FOREGROUND_START,
		@@ -13378,6 +13380,8 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		mStackSupervisor.resumeFocusedStackTopActivityLocked();
		mUserController.sendUserSwitchBroadcastsLocked(-1, currentUserId);
		traceLog.traceEnd(); // ActivityManagerStartApps
		traceLog.traceEnd(); // PhaseActivityManagerReady
		}
		}

services/java/com/android/server/SystemServer.java

+156 −161

Original line number	Diff line number	Diff line
		@@ -710,10 +710,12 @@ public final class SystemServer {
		traceEnd();
		}

		traceBeginAndSlog("SetWindowManagerService");
		mActivityManagerService.setWindowManager(wm);
		traceEnd();

		inputManager.setWindowManagerCallbacks(wm.getInputMonitor());
		traceBeginAndSlog("StartInputManager");
		inputManager.setWindowManagerCallbacks(wm.getInputMonitor());
		inputManager.start();
		traceEnd();

		@@ -1238,8 +1240,10 @@ public final class SystemServer {
		}

		if (!disableNetwork && !disableNonCoreServices && EmergencyAffordanceManager.ENABLED) {
		// EmergencyMode sevice
		// EmergencyMode service
		traceBeginAndSlog("StartEmergencyAffordanceService");
		mSystemServiceManager.startService(EmergencyAffordanceService.class);
		traceEnd();
		}

		if (!disableNonCoreServices) {
		@@ -1482,16 +1486,12 @@ public final class SystemServer {
		// where third party code can really run (but before it has actually
		// started launching the initial applications), for us to complete our
		// initialization.
		mActivityManagerService.systemReady(new Runnable() {
		@Override
		public void run() {
		mActivityManagerService.systemReady(() -> {
		Slog.i(TAG, "Making services ready");
		traceBeginAndSlog("StartActivityManagerReadyPhase");
		mSystemServiceManager.startBootPhase(
		SystemService.PHASE_ACTIVITY_MANAGER_READY);
		traceEnd();
		traceBeginAndSlog("PhaseActivityManagerReady");

		traceBeginAndSlog("StartObservingNativeCrashes");
		try {
		mActivityManagerService.startObservingNativeCrashes();
		@@ -1635,7 +1635,6 @@ public final class SystemServer {
		reportWtf("Notifying NetworkScoreService running", e);
		}
		traceEnd();

		traceBeginAndSlog("IncidentDaemonReady");
		try {
		// TODO: Switch from checkService to getService once it's always
		@@ -1647,11 +1646,7 @@ public final class SystemServer {
		reportWtf("Notifying incident daemon running", e);
		}
		traceEnd();


		traceEnd(); // PhaseActivityManagerReady
		}
		});
		}, BOOT_TIMINGS_TRACE_LOG);
		}

		static final void startSystemUi(Context context) {