Merge "SystemServer: add isWatch guard for Twilight & WiredAccessory" (85b00250) · Commits · e / os / android_frameworks_base

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

+16 −12

Original line number	Diff line number	Diff line
		@@ -2124,6 +2124,7 @@ public final class SystemServer implements Dumpable {
		t.traceEnd();
		}

		if (!isWatch) {
		t.traceBegin("StartWiredAccessoryManager");
		try {
		// Listen for wired headset changes
		@@ -2133,6 +2134,7 @@ public final class SystemServer implements Dumpable {
		reportWtf("starting WiredAccessoryManager", e);
		}
		t.traceEnd();
		}

		if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_MIDI)) {
		// Start MIDI Manager service
		@@ -2182,9 +2184,11 @@ public final class SystemServer implements Dumpable {
		}
		t.traceEnd();

		if (!isWatch) {
		t.traceBegin("StartTwilightService");
		mSystemServiceManager.startService(TwilightService.class);
		t.traceEnd();
		}

		t.traceBegin("StartColorDisplay");
		mSystemServiceManager.startService(ColorDisplayService.class);