Merge "Make TextServicesManagerService optional on Wear." into main (93d5d9a5) · Commits · e / os / android_frameworks_base

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ import android.util.DisplayMetrics;
		import android.util.Dumpable;
		import android.util.EventLog;
		import android.util.IndentingPrintWriter;
		import android.util.Log;
		import android.util.Pair;
		import android.util.Slog;
		import android.util.TimeUtils;
		@@ -2005,9 +2006,11 @@ public final class SystemServer implements Dumpable {
		mSystemServiceManager.startService(new FontManagerService.Lifecycle(context, safeMode));
		t.traceEnd();

		if (!isWatch \|\| !android.server.Flags.removeTextService()) {
		t.traceBegin("StartTextServicesManager");
		mSystemServiceManager.startService(TextServicesManagerService.Lifecycle.class);
		t.traceEnd();
		}

		if (!disableSystemTextClassifier) {
		t.traceBegin("StartTextClassificationManagerService");

+7 −0

Original line number	Diff line number	Diff line
		@@ -8,3 +8,10 @@ flag {
		is_fixed_read_only: true
		bug: "324153471"
		}

		flag {
		name: "remove_text_service"
		namespace: "wear_frameworks"
		description: "Remove TextServiceManagerService on Wear"
		bug: "323720705"
		}
		No newline at end of file