Merge "Remove the use of isDesktop in SystemServer" into main (c5b310ff) · Commits · e / os / android_frameworks_base

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

+3 −5

Original line number	Diff line number	Diff line
		@@ -1541,8 +1541,6 @@ public final class SystemServer implements Dumpable {
		boolean disableCameraService = SystemProperties.getBoolean("config.disable_cameraservice",
		false);

		boolean isDesktop = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_PC);

		boolean isWatch = RoSystemFeatures.hasFeatureWatch(context);

		boolean isArc = context.getPackageManager().hasSystemFeature(
		@@ -1664,7 +1662,7 @@ public final class SystemServer implements Dumpable {
		t.traceEnd();
		}

		if (!isTv && !isDesktop) {
		if (!isTv) {
		t.traceBegin("StartVibratorManagerService");
		mSystemServiceManager.startService(VibratorManagerService.Lifecycle.class);
		t.traceEnd();
		@@ -1805,7 +1803,7 @@ public final class SystemServer implements Dumpable {
		mSystemServiceManager.startService(LogcatManagerService.class);
		t.traceEnd();

		if (!isWatch && !isTv && !isAutomotive && !isDesktop
		if (!isWatch && !isTv && !isAutomotive
		&& android.security.Flags.aflApi()) {
		t.traceBegin("StartIntrusionDetectionService");
		mSystemServiceManager.startService(IntrusionDetectionService.class);
		@@ -1818,7 +1816,7 @@ public final class SystemServer implements Dumpable {
		t.traceEnd();
		}

		if (!isWatch && !isTv && !isAutomotive && !isDesktop
		if (!isWatch && !isTv && !isAutomotive
		&& android.security.Flags.aapmApi()) {
		t.traceBegin("StartAdvancedProtectionService");
		mSystemServiceManager.startService(AdvancedProtectionService.Lifecycle.class);