diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 648b8100cd36050a2eb46c39d8dd36abd8f8c1ae..8caf5aedda494a01f6a8be0cb712fe14ca510185 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -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(); - t.traceBegin("StartTextServicesManager"); - mSystemServiceManager.startService(TextServicesManagerService.Lifecycle.class); - t.traceEnd(); + if (!isWatch || !android.server.Flags.removeTextService()) { + t.traceBegin("StartTextServicesManager"); + mSystemServiceManager.startService(TextServicesManagerService.Lifecycle.class); + t.traceEnd(); + } if (!disableSystemTextClassifier) { t.traceBegin("StartTextClassificationManagerService"); diff --git a/services/java/com/android/server/flags.aconfig b/services/java/com/android/server/flags.aconfig index 4b578afddad235de7af5b364ba6bc951ebdef91b..a291a4948d63c5bcc41da19b7129648d5c5305e4 100644 --- a/services/java/com/android/server/flags.aconfig +++ b/services/java/com/android/server/flags.aconfig @@ -7,3 +7,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