Merge "The startup of the system services should be conditional." into nyc-dev (f122f9f5) · Commits · e / os / android_frameworks_base

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

+39 −23

Original line number	Diff line number	Diff line
		@@ -518,6 +518,16 @@ public final class SystemServer {
		boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false);
		boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);
		boolean disableRtt = SystemProperties.getBoolean("config.disable_rtt", false);
		boolean disableMediaProjection = SystemProperties.getBoolean("config.disable_mediaproj",
		false);
		boolean disableSerial = SystemProperties.getBoolean("config.disable_serial", false);
		boolean disableSearchManager = SystemProperties.getBoolean("config.disable_searchmanager",
		false);
		boolean disableTrustManager = SystemProperties.getBoolean("config.disable_trustmanager",
		false);
		boolean disableTextServices = SystemProperties.getBoolean("config.disable_textservices", false);
		boolean disableSamplingProfiler = SystemProperties.getBoolean("config.disable_samplingprof",
		false);
		boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");

		try {
		@@ -761,7 +771,7 @@ public final class SystemServer {
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
		}

		if (!disableNonCoreServices) {
		if (!disableNonCoreServices && !disableTextServices) {
		mSystemServiceManager.startService(TextServicesManagerService.Lifecycle.class);
		}

		@@ -912,7 +922,7 @@ public final class SystemServer {
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
		}

		if (!disableNonCoreServices) {
		if (!disableNonCoreServices && !disableSearchManager) {
		traceBeginAndSlog("StartSearchManagerService");
		try {
		mSystemServiceManager.startService(SEARCH_MANAGER_SERVICE_CLASS);
		@@ -974,6 +984,7 @@ public final class SystemServer {
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
		}

		if (!disableSerial) {
		traceBeginAndSlog("StartSerialService");
		try {
		// Serial port support
		@@ -983,6 +994,7 @@ public final class SystemServer {
		Slog.e(TAG, "Failure starting SerialService", e);
		}
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
		}

		Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER,
		"StartHardwarePropertiesManagerService");
		@@ -1030,6 +1042,7 @@ public final class SystemServer {
		}
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

		if (!disableSamplingProfiler) {
		traceBeginAndSlog("StartSamplingProfilerService");
		try {
		// need to add this service even if SamplingProfilerIntegration.isEnabled()
		@@ -1042,6 +1055,7 @@ public final class SystemServer {
		reportWtf("starting SamplingProfiler Service", e);
		}
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);
		}

		if (!disableNetwork && !disableNetworkTime) {
		traceBeginAndSlog("StartNetworkTimeUpdateService");
		@@ -1122,7 +1136,9 @@ public final class SystemServer {
		}
		Trace.traceEnd(Trace.TRACE_TAG_SYSTEM_SERVER);

		if (!disableTrustManager) {
		mSystemServiceManager.startService(TrustManagerService.class);
		}

		if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
		mSystemServiceManager.startService(FingerprintService.class);
		@@ -1142,7 +1158,7 @@ public final class SystemServer {
		mSystemServiceManager.startService(LauncherAppsService.class);
		}

		if (!disableNonCoreServices) {
		if (!disableNonCoreServices && !disableMediaProjection) {
		mSystemServiceManager.startService(MediaProjectionManagerService.class);
		}