From 477c34421ba65fc223c0b4d0443276d51fc92135 Mon Sep 17 00:00:00 2001
From: Calvin Pan <calvinpan@google.com>
Date: Mon, 9 Jan 2023 18:07:09 +0800
Subject: [PATCH] Add feature flag for grammatical inflection

Bug: 237579711
Test: Build pass
Change-Id: Ia600a6ad0d5ec139f91b1aba099e07560bb962f9
---
 .../GrammaticalInflectionService.java                      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
index 11a429481edb6..6cfe921f2c423 100644
--- a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
+++ b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
@@ -21,6 +21,7 @@ import static android.content.res.Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED
 import android.app.IGrammaticalInflectionManager;
 import android.content.Context;
 import android.os.IBinder;
+import android.os.SystemProperties;
 
 import com.android.server.LocalServices;
 import com.android.server.SystemService;
@@ -34,6 +35,8 @@ import com.android.server.wm.ActivityTaskManagerInternal;
 public class GrammaticalInflectionService extends SystemService {
 
     private final ActivityTaskManagerInternal mActivityTaskManagerInternal;
+    private static final String GRAMMATICAL_INFLECTION_ENABLED =
+            "i18n.grammatical_Inflection.enabled";
 
     /**
      * Initializes the system service.
@@ -67,6 +70,10 @@ public class GrammaticalInflectionService extends SystemService {
 
     private void setRequestedApplicationGrammaticalGender(
             String appPackageName, int userId, int gender) {
+        if (!SystemProperties.getBoolean(GRAMMATICAL_INFLECTION_ENABLED, true)) {
+            return;
+        }
+
         final ActivityTaskManagerInternal.PackageConfigurationUpdater updater =
                 mActivityTaskManagerInternal.createPackageConfigurationUpdater(appPackageName,
                         userId);