Merge "Remove android.server.early_system_config_init flag" into main (b77168e7) · Commits · e / os / android_frameworks_base

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

+4 −12

Original line number	Diff line number	Diff line
		@@ -940,12 +940,10 @@ public final class SystemServer implements Dumpable {
		SystemServerInitThreadPool tp = SystemServerInitThreadPool.start();
		mDumper.addDumpable(tp);

		if (android.server.Flags.earlySystemConfigInit()) {
		// SystemConfig init is expensive, so enqueue the work as early as possible to allow
		// concurrent execution before it's needed (typically by ActivityManagerService).
		// As native library loading is also expensive, this is a good place to start.
		startSystemConfigInit(t);
		}

		// Initialize native services.
		System.loadLibrary("android_servers");
		@@ -1193,12 +1191,6 @@ public final class SystemServer implements Dumpable {
		mDumper.addDumpable(watchdog);
		t.traceEnd();

		// Legacy entry point for starting SystemConfig init, only needed if the early init flag is
		// disabled and we haven't already triggered init before bootstrap services.
		if (!android.server.Flags.earlySystemConfigInit()) {
		startSystemConfigInit(t);
		}

		// Orchestrates some ProtoLogging functionality.
		if (android.tracing.Flags.clientSideProtoLogging()) {
		t.traceBegin("StartProtoLogConfigurationService");

+0 −7

Original line number	Diff line number	Diff line
		@@ -9,13 +9,6 @@ flag {
		bug: "324153471"
		}

		flag {
		namespace: "system_performance"
		name: "early_system_config_init"
		description: "Perform earlier initialization of SystemConfig in system server startup."
		bug: "383869534"
		}

		flag {
		name: "remove_text_service"
		namespace: "wear_frameworks"