From c6743b43e07300e0caf5112f2f846a2b24b80aa2 Mon Sep 17 00:00:00 2001
From: Tony Mak <tonymak@google.com>
Date: Thu, 25 May 2023 08:32:13 +0000
Subject: Set compile_multilib to be "both"

BUG: 274028926

Change-Id: I4b2815541704c618d9e732fc3f36d2f3529208fc
---
 native/Android.bp      | 11 +++++++++--
 native/AndroidTest.xml |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/native/Android.bp b/native/Android.bp
index ae7f5c8..efea632 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -278,8 +278,15 @@ cc_test {
         "libtextclassifier_fbgen_utils_lua_utils_tests",
     ],
 
-    compile_multilib: "prefer32",
-
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
     // A workaround for code coverage. See b/166040889#comment23
     sdk_variant_only: true,
 }
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index 11893f5..15ce73e 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -21,6 +21,11 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="cleanup" value="true" />
         <option name="push" value="libtextclassifier_tests->/data/local/tmp/libtextclassifier_tests" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
         <option name="push" value="actions->/data/local/tmp/actions" />
         <option name="push" value="annotator->/data/local/tmp/annotator" />
         <option name="push" value="utils->/data/local/tmp/utils" />
-- 
cgit v1.2.3


From 16dc578898caf5ee82744e8ca63839110c622a00 Mon Sep 17 00:00:00 2001
From: Neha Pattan <npattan@google.com>
Date: Thu, 6 Jul 2023 23:26:44 +0000
Subject: Rename first variant for ExtServices to _tplus.

Test: atest
Bug: 282185097
Change-Id: I80a13f04c012163ad4a44823906f8c73a1e112af
---
 TEST_MAPPING           | 8 ++++----
 native/AndroidTest.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 17a31d4..e0f1900 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -47,16 +47,16 @@
   ],
   "mainline-presubmit": [
     {
-      "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
+      "name": "TextClassifierNotificationTests[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "TextClassifierServiceTest[com.google.android.extservices.apex]"
+      "name": "TextClassifierServiceTest[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "libtextclassifier_tests[com.google.android.extservices.apex]"
+      "name": "libtextclassifier_tests[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "libtextclassifier_java_tests[com.google.android.extservices.apex]"
+      "name": "libtextclassifier_java_tests[com.google.android.extservices_tplus.apex]"
     }
   ]
 }
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index 15ce73e..4ca0418 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for libtextclassifier_tests">
-    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
     <option name="test-suite-tag" value="apct" />
     <option name="test-suite-tag" value="mts" />
 
-- 
cgit v1.2.3


From fea676896127c717169504393796a97cad9ea5c0 Mon Sep 17 00:00:00 2001
From: Greg Kaiser <gkaiser@google.com>
Date: Tue, 11 Jul 2023 22:07:05 +0000
Subject: Revert "Rename first variant for ExtServices to _tplus."

Revert submission 23924907-rename-ext-variant

Reason for revert: Suspect in b/290808342

Reverted changes: /q/submissionid:23924907-rename-ext-variant

Change-Id: I47d2fbd19e55283a4ce2e8d01aa4621bc6389c2a
---
 TEST_MAPPING           | 8 ++++----
 native/AndroidTest.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index e0f1900..17a31d4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -47,16 +47,16 @@
   ],
   "mainline-presubmit": [
     {
-      "name": "TextClassifierNotificationTests[com.google.android.extservices_tplus.apex]"
+      "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
     },
     {
-      "name": "TextClassifierServiceTest[com.google.android.extservices_tplus.apex]"
+      "name": "TextClassifierServiceTest[com.google.android.extservices.apex]"
     },
     {
-      "name": "libtextclassifier_tests[com.google.android.extservices_tplus.apex]"
+      "name": "libtextclassifier_tests[com.google.android.extservices.apex]"
     },
     {
-      "name": "libtextclassifier_java_tests[com.google.android.extservices_tplus.apex]"
+      "name": "libtextclassifier_java_tests[com.google.android.extservices.apex]"
     }
   ]
 }
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index 4ca0418..15ce73e 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for libtextclassifier_tests">
-    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
     <option name="test-suite-tag" value="apct" />
     <option name="test-suite-tag" value="mts" />
 
-- 
cgit v1.2.3


From 61704905f2aeb40b0f506fe889bc4c2eb526fdb8 Mon Sep 17 00:00:00 2001
From: Neha Pattan <npattan@google.com>
Date: Wed, 12 Jul 2023 00:48:44 +0000
Subject: Revert^2 "Rename first variant for ExtServices to _tplus."

fea676896127c717169504393796a97cad9ea5c0

Change-Id: I87c3764063968cc7712c06e5ba925c5f97a95497
---
 TEST_MAPPING           | 8 ++++----
 native/AndroidTest.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 17a31d4..e0f1900 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -47,16 +47,16 @@
   ],
   "mainline-presubmit": [
     {
-      "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
+      "name": "TextClassifierNotificationTests[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "TextClassifierServiceTest[com.google.android.extservices.apex]"
+      "name": "TextClassifierServiceTest[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "libtextclassifier_tests[com.google.android.extservices.apex]"
+      "name": "libtextclassifier_tests[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "libtextclassifier_java_tests[com.google.android.extservices.apex]"
+      "name": "libtextclassifier_java_tests[com.google.android.extservices_tplus.apex]"
     }
   ]
 }
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
index 15ce73e..4ca0418 100644
--- a/native/AndroidTest.xml
+++ b/native/AndroidTest.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 <configuration description="Config for libtextclassifier_tests">
-    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
     <option name="test-suite-tag" value="apct" />
     <option name="test-suite-tag" value="mts" />
 
-- 
cgit v1.2.3


From 35b28a503b24937f56c11e4de4d7aba18e225c1a Mon Sep 17 00:00:00 2001
From: Robert Marcus <ramarcus@google.com>
Date: Fri, 21 Jul 2023 20:58:20 +0000
Subject: Update tplus to have min_sdk_version 33

Test: presubmit
Bug: 291775136
Bug: 292157828
Change-Id: Ibc1309a97665343ab7bfff4405a8fce9b7ac003b
---
 TEST_MAPPING                  | 24 +++++++++++++++++++---
 native/Android.bp             | 44 ++++++++++++++++++++++++++++++++++++++-
 native/AndroidTest-sminus.xml | 48 +++++++++++++++++++++++++++++++++++++++++++
 native/AndroidTest-tplus.xml  | 46 +++++++++++++++++++++++++++++++++++++++++
 native/AndroidTest.xml        | 42 -------------------------------------
 5 files changed, 158 insertions(+), 46 deletions(-)
 create mode 100644 native/AndroidTest-sminus.xml
 create mode 100644 native/AndroidTest-tplus.xml
 delete mode 100644 native/AndroidTest.xml

diff --git a/TEST_MAPPING b/TEST_MAPPING
index e0f1900..35a11fd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -9,7 +9,10 @@
       ]
     },
     {
-      "name": "libtextclassifier_tests"
+      "name": "libtextclassifier_tests-tplus"
+    },
+    {
+      "name": "libtextclassifier_tests-sminus"
     },
     {
       "name": "libtextclassifier_java_tests"
@@ -36,7 +39,10 @@
       ]
     },
     {
-      "name": "libtextclassifier_tests"
+      "name": "libtextclassifier_tests-tplus"
+    },
+    {
+      "name": "libtextclassifier_tests-sminus"
     },
     {
       "name": "libtextclassifier_java_tests"
@@ -53,10 +59,22 @@
       "name": "TextClassifierServiceTest[com.google.android.extservices_tplus.apex]"
     },
     {
-      "name": "libtextclassifier_tests[com.google.android.extservices_tplus.apex]"
+      "name": "libtextclassifier_tests-tplus[com.google.android.extservices_tplus.apex]"
     },
     {
       "name": "libtextclassifier_java_tests[com.google.android.extservices_tplus.apex]"
+    },
+    {
+      "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"
+    },
+    {
+      "name": "TextClassifierServiceTest[com.google.android.extservices.apex]"
+    },
+    {
+      "name": "libtextclassifier_tests-sminus[com.google.android.extservices.apex]"
+    },
+    {
+      "name": "libtextclassifier_java_tests[com.google.android.extservices.apex]"
     }
   ]
 }
diff --git a/native/Android.bp b/native/Android.bp
index efea632..f482b84 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -252,7 +252,7 @@ cc_library {
 // libtextclassifier_tests
 // -----------------------
 cc_test {
-    name: "libtextclassifier_tests",
+    name: "libtextclassifier_tests-tplus",
     defaults: ["libtextclassifier_defaults"],
 
     test_suites: ["general-tests", "mts-extservices"],
@@ -289,6 +289,48 @@ cc_test {
     },
     // A workaround for code coverage. See b/166040889#comment23
     sdk_variant_only: true,
+    test_config: "AndroidTest-tplus.xml",
+}
+
+cc_test {
+    name: "libtextclassifier_tests-sminus",
+    defaults: ["libtextclassifier_defaults"],
+
+    test_suites: ["general-tests", "mts-extservices"],
+
+    data: [
+        "**/test_data/*",
+        "**/*.bfbs",
+    ],
+
+    srcs: ["**/*.cc"],
+    exclude_srcs: [":libtextclassifier_java_test_sources"],
+
+    header_libs: ["jni_headers"],
+
+    static_libs: [
+        "libgmock_ndk",
+        "libgtest_ndk_c++",
+        "libbase_ndk",
+    ],
+
+    generated_headers: [
+        "libtextclassifier_fbgen_utils_flatbuffers_flatbuffers_test",
+        "libtextclassifier_fbgen_utils_lua_utils_tests",
+    ],
+
+    compile_multilib: "both",
+    multilib: {
+        lib32: {
+            suffix: "32",
+        },
+        lib64: {
+            suffix: "64",
+        },
+    },
+    // A workaround for code coverage. See b/166040889#comment23
+    sdk_variant_only: true,
+    test_config: "AndroidTest-sminus.xml",
 }
 
 // ------------------------------------
diff --git a/native/AndroidTest-sminus.xml b/native/AndroidTest-sminus.xml
new file mode 100644
index 0000000..b4c8628
--- /dev/null
+++ b/native/AndroidTest-sminus.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Config for libtextclassifier_tests-sminus">
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices.apex" />
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="mts" />
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="libtextclassifier_tests-sminus->/data/local/tmp/libtextclassifier_tests-sminus" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="actions->/data/local/tmp/actions" />
+        <option name="push" value="annotator->/data/local/tmp/annotator" />
+        <option name="push" value="utils->/data/local/tmp/utils" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp" />
+        <option name="module-name" value="libtextclassifier_tests-sminus" />
+    </test>
+
+    <!-- Prevent test from running on Android T+ -->
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.MaxSdkModuleController">
+        <option name="max-sdk-level" value="32"/>
+    </object>
+
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.extservices" />
+    </object>
+</configuration>
diff --git a/native/AndroidTest-tplus.xml b/native/AndroidTest-tplus.xml
new file mode 100644
index 0000000..3c35ebb
--- /dev/null
+++ b/native/AndroidTest-tplus.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<configuration description="Config for libtextclassifier_tests-tplus">
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
+    <option name="test-suite-tag" value="apct" />
+    <option name="test-suite-tag" value="mts" />
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="libtextclassifier_tests-tplus->/data/local/tmp/libtextclassifier_tests-tplus" />
+        <option name="append-bitness" value="true" />
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="actions->/data/local/tmp/actions" />
+        <option name="push" value="annotator->/data/local/tmp/annotator" />
+        <option name="push" value="utils->/data/local/tmp/utils" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.GTest" >
+        <option name="native-test-device-path" value="/data/local/tmp" />
+        <option name="module-name" value="libtextclassifier_tests-tplus" />
+    </test>
+
+    <!-- Prevent tests from running on Android S- -->
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.Sdk32ModuleController"/>
+
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.extservices" />
+    </object>
+</configuration>
diff --git a/native/AndroidTest.xml b/native/AndroidTest.xml
deleted file mode 100644
index 4ca0418..0000000
--- a/native/AndroidTest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<configuration description="Config for libtextclassifier_tests">
-    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.extservices_tplus.apex" />
-    <option name="test-suite-tag" value="apct" />
-    <option name="test-suite-tag" value="mts" />
-
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-        <option name="push" value="libtextclassifier_tests->/data/local/tmp/libtextclassifier_tests" />
-        <option name="append-bitness" value="true" />
-    </target_preparer>
-
-    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
-        <option name="cleanup" value="true" />
-        <option name="push" value="actions->/data/local/tmp/actions" />
-        <option name="push" value="annotator->/data/local/tmp/annotator" />
-        <option name="push" value="utils->/data/local/tmp/utils" />
-    </target_preparer>
-
-    <test class="com.android.tradefed.testtype.GTest" >
-        <option name="native-test-device-path" value="/data/local/tmp" />
-        <option name="module-name" value="libtextclassifier_tests" />
-    </test>
-
-    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.google.android.extservices" />
-    </object>
-</configuration>
-- 
cgit v1.2.3


From e81972289359d52b77ca0ca41436da53a4725652 Mon Sep 17 00:00:00 2001
From: qiaoli <qiaoli@google.com>
Date: Mon, 1 May 2023 21:16:22 +0000
Subject: Allow ODP module to access libtextclassifier_hash_headers library.

Test: mma
Bug: 277775356
Change-Id: Id038036210b9ea9aa216749722d733ebf6e389b7
---
 native/Android.bp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/native/Android.bp b/native/Android.bp
index f482b84..a57df61 100644
--- a/native/Android.bp
+++ b/native/Android.bp
@@ -30,6 +30,7 @@ cc_library_headers {
         "//apex_available:platform",
         "com.android.neuralnetworks",
         "test_com.android.neuralnetworks",
+        "com.android.ondevicepersonalization",
     ],
     min_sdk_version: "apex_inherit",
     sdk_version: "current",
@@ -69,6 +70,7 @@ cc_library_static {
         "test_com.android.neuralnetworks",
         "com.android.extservices",
         "com.android.adservices",
+        "com.android.ondevicepersonalization",
     ],
 }
 
-- 
cgit v1.2.3


From dc6eff193d61657e4c6c6a33daf0808add91986c Mon Sep 17 00:00:00 2001
From: Robert Marcus <ramarcus@google.com>
Date: Mon, 11 Sep 2023 15:07:19 +0000
Subject: Fix module controller for tplus tests

Bug: 287415447
Test: presubmit
Change-Id: I4234adccb4cf359053713d156455777fdc72a6d4
---
 native/AndroidTest-tplus.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/native/AndroidTest-tplus.xml b/native/AndroidTest-tplus.xml
index 3c35ebb..ab2749c 100644
--- a/native/AndroidTest-tplus.xml
+++ b/native/AndroidTest-tplus.xml
@@ -38,7 +38,7 @@
 
     <!-- Prevent tests from running on Android S- -->
     <object type="module_controller"
-            class="com.android.tradefed.testtype.suite.module.Sdk32ModuleController"/>
+            class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController"/>
 
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="mainline-module-package-name" value="com.google.android.extservices" />
-- 
cgit v1.2.3


From e2f7742eede9a0ee3fbdac7880d9b25e438cbbf5 Mon Sep 17 00:00:00 2001
From: Ruslan Kim <ruslankim@google.com>
Date: Tue, 3 Oct 2023 19:21:00 +0000
Subject: For Wear devices download textclassifier manifest on charger Moving
 cl/569239296 to main

Test: make && make dist

Change-Id: I41020f4bded9e278edaf7f2842df7b8152289ea0
---
 .../DefaultTextClassifierService.java              |  2 +-
 .../common/TextClassifierSettings.java             | 39 +++++++++++++++++++---
 .../downloader/DownloadedModelManagerImpl.java     |  3 +-
 .../downloader/ModelDownloadWorker.java            |  3 +-
 .../DefaultTextClassifierServiceTest.java          |  2 +-
 .../textclassifier/ModelFileManagerImplTest.java   | 18 +++++-----
 .../textclassifier/TextClassifierImplTest.java     |  6 ++--
 .../common/TextClassifierSettingsTest.java         |  2 +-
 .../downloader/DownloadedModelManagerImplTest.java |  2 +-
 .../textclassifier/downloader/LocaleUtilsTest.java |  2 +-
 .../downloader/ModelDownloadManagerTest.java       |  4 +--
 .../downloader/ModelDownloadWorkerTest.java        |  2 +-
 12 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/java/src/com/android/textclassifier/DefaultTextClassifierService.java b/java/src/com/android/textclassifier/DefaultTextClassifierService.java
index d57af5e..d34f860 100644
--- a/java/src/com/android/textclassifier/DefaultTextClassifierService.java
+++ b/java/src/com/android/textclassifier/DefaultTextClassifierService.java
@@ -316,7 +316,7 @@ public final class DefaultTextClassifierService extends TextClassifierService {
 
     @Override
     public TextClassifierSettings createTextClassifierSettings() {
-      return new TextClassifierSettings();
+      return new TextClassifierSettings(getContext());
     }
 
     @Override
diff --git a/java/src/com/android/textclassifier/common/TextClassifierSettings.java b/java/src/com/android/textclassifier/common/TextClassifierSettings.java
index d0ea917..6de8fe2 100644
--- a/java/src/com/android/textclassifier/common/TextClassifierSettings.java
+++ b/java/src/com/android/textclassifier/common/TextClassifierSettings.java
@@ -18,6 +18,8 @@ package com.android.textclassifier.common;
 
 import static java.util.concurrent.TimeUnit.HOURS;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.provider.DeviceConfig;
 import android.provider.DeviceConfig.Properties;
 import android.text.TextUtils;
@@ -55,15 +57,20 @@ public final class TextClassifierSettings {
 
   /** Whether the user language profile feature is enabled. */
   private static final String USER_LANGUAGE_PROFILE_ENABLED = "user_language_profile_enabled";
+
   /** Max length of text that suggestSelection can accept. */
   @VisibleForTesting
   static final String SUGGEST_SELECTION_MAX_RANGE_LENGTH = "suggest_selection_max_range_length";
+
   /** Max length of text that classifyText can accept. */
   private static final String CLASSIFY_TEXT_MAX_RANGE_LENGTH = "classify_text_max_range_length";
+
   /** Max length of text that generateLinks can accept. */
   private static final String GENERATE_LINKS_MAX_TEXT_LENGTH = "generate_links_max_text_length";
+
   /** Sampling rate for generateLinks logging. */
   private static final String GENERATE_LINKS_LOG_SAMPLE_RATE = "generate_links_log_sample_rate";
+
   /**
    * Extra count that is added to some languages, e.g. system languages, when deducing the frequent
    * languages in {@link
@@ -75,52 +82,65 @@ public final class TextClassifierSettings {
    * hint is not given.
    */
   @VisibleForTesting static final String ENTITY_LIST_DEFAULT = "entity_list_default";
+
   /**
    * A colon(:) separated string that specifies the default entities types for generateLinks when
    * the text is in a not editable UI widget.
    */
   private static final String ENTITY_LIST_NOT_EDITABLE = "entity_list_not_editable";
+
   /**
    * A colon(:) separated string that specifies the default entities types for generateLinks when
    * the text is in an editable UI widget.
    */
   private static final String ENTITY_LIST_EDITABLE = "entity_list_editable";
+
   /**
    * A colon(:) separated string that specifies the default action types for
    * suggestConversationActions when the suggestions are used in an app.
    */
   private static final String IN_APP_CONVERSATION_ACTION_TYPES_DEFAULT =
       "in_app_conversation_action_types_default";
+
   /**
    * A colon(:) separated string that specifies the default action types for
    * suggestConversationActions when the suggestions are used in a notification.
    */
   private static final String NOTIFICATION_CONVERSATION_ACTION_TYPES_DEFAULT =
       "notification_conversation_action_types_default";
+
   /** Threshold to accept a suggested language from LangID model. */
   @VisibleForTesting static final String LANG_ID_THRESHOLD_OVERRIDE = "lang_id_threshold_override";
+
   /** Whether to enable {@link com.android.textclassifier.intent.TemplateIntentFactory}. */
   @VisibleForTesting
   static final String TEMPLATE_INTENT_FACTORY_ENABLED = "template_intent_factory_enabled";
+
   /** Whether to enable "translate" action in classifyText. */
   private static final String TRANSLATE_IN_CLASSIFICATION_ENABLED =
       "translate_in_classification_enabled";
+
   /**
    * Whether to detect the languages of the text in request by using langId for the native model.
    */
   private static final String DETECT_LANGUAGES_FROM_TEXT_ENABLED =
       "detect_languages_from_text_enabled";
+
   /** Whether to use models downloaded by config updater. */
   private static final String CONFIG_UPDATER_MODEL_ENABLED = "config_updater_model_enabled";
+
   /** Whether to enable model downloading with ModelDownloadManager */
   @VisibleForTesting
   public static final String MODEL_DOWNLOAD_MANAGER_ENABLED = "model_download_manager_enabled";
+
   /** Type of network to download model manifest. A String value of androidx.work.NetworkType. */
   private static final String MANIFEST_DOWNLOAD_REQUIRED_NETWORK_TYPE =
       "manifest_download_required_network_type";
+
   /** Max attempts allowed for a single ModelDownloader downloading task. */
   @VisibleForTesting
   static final String MODEL_DOWNLOAD_WORKER_MAX_ATTEMPTS = "model_download_worker_max_attempts";
+
   /** Max attempts allowed for a certain manifest url. */
   @VisibleForTesting
   public static final String MANIFEST_DOWNLOAD_MAX_ATTEMPTS = "manifest_download_max_attempts";
@@ -181,6 +201,7 @@ public final class TextClassifierSettings {
    * @see {@code TextClassifierImpl#detectLanguages(String, int, int)} for reference.
    */
   @VisibleForTesting static final String LANG_ID_CONTEXT_SETTINGS = "lang_id_context_settings";
+
   /** Default threshold to translate the language of the context the user selects */
   private static final String TRANSLATE_ACTION_THRESHOLD = "translate_action_threshold";
 
@@ -216,6 +237,7 @@ public final class TextClassifierSettings {
           ConversationAction.TYPE_VIEW_MAP,
           TYPE_ADD_CONTACT,
           TYPE_COPY);
+
   /**
    * < 0 : Not set. Use value from LangId model. 0 - 1: Override value in LangId model.
    *
@@ -236,6 +258,7 @@ public final class TextClassifierSettings {
   private static final int MANIFEST_DOWNLOAD_MAX_ATTEMPTS_DEFAULT = 3;
   private static final long MODEL_DOWNLOAD_BACKOFF_DELAY_IN_MILLIS_DEFAULT = HOURS.toMillis(1);
   private static final boolean MANIFEST_DOWNLOAD_REQUIRES_DEVICE_IDLE_DEFAULT = false;
+  private static final boolean MANIFEST_DOWNLOAD_REQUIRES_CHARGING_WEAR_DEFAULT = true;
   private static final boolean MANIFEST_DOWNLOAD_REQUIRES_CHARGING_DEFAULT = false;
   private static final boolean MULTI_LANGUAGE_SUPPORT_ENABLED_DEFAULT = false;
   private static final int MULTI_LANGUAGE_MODELS_LIMIT_DEFAULT = 2;
@@ -247,6 +270,7 @@ public final class TextClassifierSettings {
   private static final String MANIFEST_URL_DEFAULT = "";
   private static final String TESTING_LOCALE_LIST_OVERRIDE_DEFAULT = "";
   private static final float[] LANG_ID_CONTEXT_SETTINGS_DEFAULT = new float[] {20f, 1.0f, 0.4f};
+
   /**
    * Sampling rate for API logging. For example, 100 means there is a 0.01 chance that the API call
    * is the logged.
@@ -327,14 +351,18 @@ public final class TextClassifierSettings {
       };
 
   private final IDeviceConfig deviceConfig;
+  private final boolean isWear;
 
-  public TextClassifierSettings() {
-    this(DEFAULT_DEVICE_CONFIG);
+  public TextClassifierSettings(Context context) {
+    this(
+        DEFAULT_DEVICE_CONFIG,
+        context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
   }
 
   @VisibleForTesting
-  public TextClassifierSettings(IDeviceConfig deviceConfig) {
+  public TextClassifierSettings(IDeviceConfig deviceConfig, boolean isWear) {
     this.deviceConfig = deviceConfig;
+    this.isWear = isWear;
   }
 
   public int getSuggestSelectionMaxRangeLength() {
@@ -461,7 +489,9 @@ public final class TextClassifierSettings {
     return deviceConfig.getBoolean(
         NAMESPACE,
         MANIFEST_DOWNLOAD_REQUIRES_CHARGING,
-        MANIFEST_DOWNLOAD_REQUIRES_CHARGING_DEFAULT);
+        isWear
+            ? MANIFEST_DOWNLOAD_REQUIRES_CHARGING_WEAR_DEFAULT
+            : MANIFEST_DOWNLOAD_REQUIRES_CHARGING_DEFAULT);
   }
 
   /* Gets a list of models urls that should not be used. Usually used for a quick rollback.  */
@@ -496,6 +526,7 @@ public final class TextClassifierSettings {
     return deviceConfig.getInt(
         NAMESPACE, MULTI_ANNOTATOR_CACHE_SIZE, MULTI_ANNOTATOR_CACHE_SIZE_DEFAULT);
   }
+
   /**
    * Gets all language variants and associated manifest url configured for a specific ModelType.
    *
diff --git a/java/src/com/android/textclassifier/downloader/DownloadedModelManagerImpl.java b/java/src/com/android/textclassifier/downloader/DownloadedModelManagerImpl.java
index 9bdfb5e..8e60c15 100644
--- a/java/src/com/android/textclassifier/downloader/DownloadedModelManagerImpl.java
+++ b/java/src/com/android/textclassifier/downloader/DownloadedModelManagerImpl.java
@@ -77,7 +77,8 @@ public final class DownloadedModelManagerImpl implements DownloadedModelManager
                 .build();
         File modelDownloaderDir = new File(context.getFilesDir(), DOWNLOAD_SUB_DIR_NAME);
         instance =
-            new DownloadedModelManagerImpl(db, modelDownloaderDir, new TextClassifierSettings());
+            new DownloadedModelManagerImpl(
+                db, modelDownloaderDir, new TextClassifierSettings(context));
       }
       return instance;
     }
diff --git a/java/src/com/android/textclassifier/downloader/ModelDownloadWorker.java b/java/src/com/android/textclassifier/downloader/ModelDownloadWorker.java
index ff04aea..a71cdef 100644
--- a/java/src/com/android/textclassifier/downloader/ModelDownloadWorker.java
+++ b/java/src/com/android/textclassifier/downloader/ModelDownloadWorker.java
@@ -78,7 +78,7 @@ public final class ModelDownloadWorker extends ListenableWorker {
     this.executorService = TextClassifierServiceExecutors.getDownloaderExecutor();
     this.downloader = new ModelDownloaderImpl(context, executorService);
     this.downloadedModelManager = DownloadedModelManagerImpl.getInstance(context);
-    this.settings = new TextClassifierSettings();
+    this.settings = new TextClassifierSettings(context);
     this.pendingDownloads = new ArrayMap<>();
     this.manifestsToDownload = null;
 
@@ -359,6 +359,7 @@ public final class ModelDownloadWorker extends ListenableWorker {
       return manfiestDownloadFuture;
     }
   }
+
   // Download a model and register it into Model table.
   private ListenableFuture<Void> downloadModel(ModelManifest.Model modelInfo) {
     String modelUrl = modelInfo.getUrl();
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/DefaultTextClassifierServiceTest.java b/java/tests/instrumentation/src/com/android/textclassifier/DefaultTextClassifierServiceTest.java
index ddab8bd..ff99126 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/DefaultTextClassifierServiceTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/DefaultTextClassifierServiceTest.java
@@ -279,7 +279,7 @@ public class DefaultTextClassifierServiceTest {
 
     @Override
     public TextClassifierSettings createTextClassifierSettings() {
-      return new TextClassifierSettings();
+      return new TextClassifierSettings(getContext());
     }
 
     @Override
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/ModelFileManagerImplTest.java b/java/tests/instrumentation/src/com/android/textclassifier/ModelFileManagerImplTest.java
index 0e40515..f465bf3 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/ModelFileManagerImplTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/ModelFileManagerImplTest.java
@@ -83,7 +83,7 @@ public final class ModelFileManagerImplTest {
         new File(ApplicationProvider.getApplicationContext().getCacheDir(), "rootTestDir");
     rootTestDir.mkdirs();
     Context context = ApplicationProvider.getApplicationContext();
-    settings = new TextClassifierSettings(deviceConfig);
+    settings = new TextClassifierSettings(deviceConfig, /* isWear= */ false);
     modelDownloadManager =
         new ModelDownloadManager(
             context,
@@ -135,7 +135,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, /* localePreferences= */ null, /*detectedLocales=*/ null);
+            MODEL_TYPE, /* localePreferences= */ null, /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(newerModelFile);
   }
 
@@ -149,7 +149,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, new LocaleList(DEFAULT_LOCALE), /*detectedLocales=*/ null);
+            MODEL_TYPE, new LocaleList(DEFAULT_LOCALE), /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(languageDependentModelFile);
   }
 
@@ -162,7 +162,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, new LocaleList(DEFAULT_LOCALE), /*detectedLocales=*/ null);
+            MODEL_TYPE, new LocaleList(DEFAULT_LOCALE), /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(languageIndependentModelFile);
   }
 
@@ -175,7 +175,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, new LocaleList(DEFAULT_LOCALE), /*detectedLocales=*/ null);
+            MODEL_TYPE, new LocaleList(DEFAULT_LOCALE), /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(matchButOlderModel);
   }
 
@@ -189,7 +189,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, LocaleList.forLanguageTags("zh-hk"), /*detectedLocales=*/ null);
+            MODEL_TYPE, LocaleList.forLanguageTags("zh-hk"), /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(languageDependentModelFile);
   }
 
@@ -203,7 +203,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, LocaleList.forLanguageTags("zh"), /*detectedLocales=*/ null);
+            MODEL_TYPE, LocaleList.forLanguageTags("zh"), /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(languageDependentModelFile);
   }
 
@@ -217,7 +217,7 @@ public final class ModelFileManagerImplTest {
 
     ModelFile bestModelFile =
         modelFileManager.findBestModelFile(
-            MODEL_TYPE, LocaleList.forLanguageTags("zh"), /*detectedLocales=*/ null);
+            MODEL_TYPE, LocaleList.forLanguageTags("zh"), /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(languageIndependentModelFile);
   }
 
@@ -250,7 +250,7 @@ public final class ModelFileManagerImplTest {
         modelFileManager.findBestModelFile(
             MODEL_TYPE,
             new LocaleList(Locale.forLanguageTag("en"), Locale.forLanguageTag("zh-hk")),
-            /*detectedLocales=*/ null);
+            /* detectedLocales= */ null);
     assertThat(bestModelFile).isEqualTo(languageIndependentModelFile);
   }
 
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/TextClassifierImplTest.java b/java/tests/instrumentation/src/com/android/textclassifier/TextClassifierImplTest.java
index 89d405a..8a4487d 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/TextClassifierImplTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/TextClassifierImplTest.java
@@ -93,7 +93,7 @@ public class TextClassifierImplTest {
             .setAppLabel(FakeContextBuilder.DEFAULT_COMPONENT.getPackageName(), "Test app")
             .build();
     this.deviceConfig = new TestingDeviceConfig();
-    this.settings = new TextClassifierSettings(deviceConfig);
+    this.settings = new TextClassifierSettings(deviceConfig, /* isWear= */ false);
     this.annotatorModelCache = new LruCache<>(2);
     this.classifier =
         new TextClassifierImpl(context, settings, modelFileManager, annotatorModelCache);
@@ -177,7 +177,7 @@ public class TextClassifierImplTest {
     String suggested = "http://www.android.com";
     int startIndex = text.indexOf(suggested);
     TextSelection.Request request =
-        new TextSelection.Request.Builder(text, startIndex, /*endIndex=*/ startIndex + 1)
+        new TextSelection.Request.Builder(text, startIndex, /* endIndex= */ startIndex + 1)
             .setIncludeTextClassification(true)
             .build();
 
@@ -194,7 +194,7 @@ public class TextClassifierImplTest {
   public void testSuggestSelection_notIncludeTextClassification() throws IOException {
     String text = "Visit http://www.android.com for more information";
     TextSelection.Request request =
-        new TextSelection.Request.Builder(text, /*startIndex=*/ 0, /*endIndex=*/ 4)
+        new TextSelection.Request.Builder(text, /* startIndex= */ 0, /* endIndex= */ 4)
             .setIncludeTextClassification(false)
             .build();
 
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java b/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java
index 17aef84..2f936e4 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/common/TextClassifierSettingsTest.java
@@ -139,7 +139,7 @@ public class TextClassifierSettingsTest {
   private static void assertSettings(
       Map<String, String> keyValueMap, Consumer<TextClassifierSettings> settingsConsumer) {
     TestingDeviceConfig deviceConfig = new TestingDeviceConfig();
-    TextClassifierSettings settings = new TextClassifierSettings(deviceConfig);
+    TextClassifierSettings settings = new TextClassifierSettings(deviceConfig, /* isWear= */ false);
     for (String key : keyValueMap.keySet()) {
       deviceConfig.setConfig(key, keyValueMap.get(key));
     }
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/downloader/DownloadedModelManagerImplTest.java b/java/tests/instrumentation/src/com/android/textclassifier/downloader/DownloadedModelManagerImplTest.java
index 5ff4d89..7adbf6d 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/downloader/DownloadedModelManagerImplTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/downloader/DownloadedModelManagerImplTest.java
@@ -52,7 +52,7 @@ public final class DownloadedModelManagerImplTest {
     modelDownloaderDir = new File(context.getFilesDir(), "test_dir");
     modelDownloaderDir.mkdirs();
     deviceConfig = new TestingDeviceConfig();
-    settings = new TextClassifierSettings(deviceConfig);
+    settings = new TextClassifierSettings(deviceConfig, /* isWear= */ false);
     db = Room.inMemoryDatabaseBuilder(context, DownloadedModelDatabase.class).build();
     downloadedModelManagerImpl =
         DownloadedModelManagerImpl.getInstanceForTesting(db, modelDownloaderDir, settings);
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/downloader/LocaleUtilsTest.java b/java/tests/instrumentation/src/com/android/textclassifier/downloader/LocaleUtilsTest.java
index a553c51..1350868 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/downloader/LocaleUtilsTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/downloader/LocaleUtilsTest.java
@@ -39,7 +39,7 @@ public final class LocaleUtilsTest {
   @Before
   public void setUp() {
     deviceConfig = new TestingDeviceConfig();
-    settings = new TextClassifierSettings(deviceConfig);
+    settings = new TextClassifierSettings(deviceConfig, /* isWear= */ false);
   }
 
   @Test
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadManagerTest.java b/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadManagerTest.java
index 9e11c09..6128100 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadManagerTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadManagerTest.java
@@ -83,7 +83,7 @@ public final class ModelDownloadManagerTest {
             ModelDownloadWorker.class,
             () -> workManager,
             downloadedModelManager,
-            new TextClassifierSettings(deviceConfig),
+            new TextClassifierSettings(deviceConfig, /* isWear= */ false),
             MoreExecutors.newDirectExecutorService());
     this.downloadManagerWithBadWorkManager =
         new ModelDownloadManager(
@@ -93,7 +93,7 @@ public final class ModelDownloadManagerTest {
               throw new IllegalStateException("WorkManager may fail!");
             },
             downloadedModelManager,
-            new TextClassifierSettings(deviceConfig),
+            new TextClassifierSettings(deviceConfig, /* isWear= */ false),
             MoreExecutors.newDirectExecutorService());
 
     setDefaultLocalesRule.set(DEFAULT_LOCALE_LIST);
diff --git a/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadWorkerTest.java b/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadWorkerTest.java
index 3646934..7f50f83 100644
--- a/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadWorkerTest.java
+++ b/java/tests/instrumentation/src/com/android/textclassifier/downloader/ModelDownloadWorkerTest.java
@@ -157,7 +157,7 @@ public final class ModelDownloadWorkerTest {
 
     Context context = ApplicationProvider.getApplicationContext();
     this.deviceConfig = new TestingDeviceConfig();
-    this.settings = new TextClassifierSettings(deviceConfig);
+    this.settings = new TextClassifierSettings(deviceConfig, /* isWear= */ false);
     this.modelDownloaderDir = new File(context.getCacheDir(), "downloaded");
     this.modelDownloaderDir.mkdirs();
     this.modelFile = new File(modelDownloaderDir, "test.model");
-- 
cgit v1.2.3