From 2d6320f4bfb7a50c3ef494543c5f59b93602f08e Mon Sep 17 00:00:00 2001
From: Russell Myers <rwmyers@google.com>
Date: Wed, 17 Apr 2024 17:57:03 +0000
Subject: [PATCH] Make TextServicesManagerService optional on Wear.

Bug: 335456104
Test: Local build / launch; CTS test in ag/27000735
Flag: android.server.remove_text_service
Change-Id: Ib7f56d663852dfcc22b8f97aed85135228235e59
---
 services/java/com/android/server/SystemServer.java | 9 ++++++---
 services/java/com/android/server/flags.aconfig     | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 648b8100cd36..8caf5aedda49 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 4b578afddad2..a291a4948d63 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
-- 
GitLab