summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Zoey Chen <zoeychen@google.com> 2024-03-13 11:33:18 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-03-13 11:33:18 +0000
commitbd3c7a8c5378d3abb6acb107d22a986b934ff36a (patch)
treef8e16f43e82f414f814708329be20713f1b5ee01
parentaf519cfe6373a0702b597fcc322859e30b314073 (diff)
parent559d64241892899fc8e848a3942b62ff14da3a0e (diff)
Merge "[ToA] Update configuration when the file is loaded after reboot" into main
-rw-r--r--services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
index e6bf2c968350..3fafca8ed377 100644
--- a/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
+++ b/services/core/java/com/android/server/grammaticalinflection/GrammaticalInflectionService.java
@@ -266,7 +266,11 @@ public class GrammaticalInflectionService extends SystemService {
throw new RuntimeException(e);
}
}
+ updateConfiguration(grammaticalGender, userId);
+ Trace.endSection();
+ }
+ private void updateConfiguration(int grammaticalGender, int userId) {
try {
Configuration config = new Configuration();
int preValue = config.getGrammaticalGender();
@@ -280,7 +284,6 @@ public class GrammaticalInflectionService extends SystemService {
} catch (RemoteException e) {
Log.w(TAG, "Can not update configuration", e);
}
- Trace.endSection();
}
public int getSystemGrammaticalGender(AttributionSource attributionSource, int userId) {
@@ -372,7 +375,9 @@ public class GrammaticalInflectionService extends SystemService {
if (mGrammaticalGenderCache.indexOfKey(userId) < 0) {
try (FileInputStream in = new FileInputStream(file)) {
final TypedXmlPullParser parser = Xml.resolvePullParser(in);
- mGrammaticalGenderCache.put(userId, getGrammaticalGenderFromXml(parser));
+ int grammaticalGender = getGrammaticalGenderFromXml(parser);
+ mGrammaticalGenderCache.put(userId, grammaticalGender);
+ updateConfiguration(grammaticalGender, userId);
} catch (IOException | XmlPullParserException e) {
Log.e(TAG, "Failed to parse XML configuration from " + file, e);
}