commit 2cf62209283859a2c049c3326cfd579d9d2f45ca
author Ben Nissan <bennissan@google.com> Fri Apr 29 17:13:55 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 29 17:13:55 2022 +0000
tree 32e1b037cb7b1d6220e9ade8dac98ee7c85da840
parent 02dffb9d8afafb87b45692405f66aabc77d46548
parent 18ce62b81616baa7189c9156829fea6d7e98d7f5

Merge "Enable AdServices dependency on native and absl code" into tm-mainline-prod

TEST_MAPPING

diff --git a/TEST_MAPPING b/TEST_MAPPING
index 72e022b..370acd6 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -21,6 +21,25 @@
       "name": "TCSModelDownloaderIntegrationTest"
     }
   ],
+  "hwasan-postsubmit": [
+    {
+      "name": "TextClassifierServiceTest",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    },
+    {
+      "name": "libtextclassifier_tests"
+    },
+    {
+      "name": "libtextclassifier_java_tests"
+    },
+    {
+      "name": "TextClassifierNotificationTests"
+    }
+  ],
   "mainline-presubmit": [
     {
       "name": "TextClassifierNotificationTests[com.google.android.extservices.apex]"

java/src/com/android/textclassifier/ModelFileManagerImpl.java

diff --git a/java/src/com/android/textclassifier/ModelFileManagerImpl.java b/java/src/com/android/textclassifier/ModelFileManagerImpl.java
index e3b646f..45426d0 100644
--- a/java/src/com/android/textclassifier/ModelFileManagerImpl.java
+++ b/java/src/com/android/textclassifier/ModelFileManagerImpl.java
@@ -390,18 +390,7 @@
               localePreferences.get(0),
               targetLocale));
     }
-    ModelFile modelFile = findBestModelFile(modelType, targetLocale);
-    TcLog.d(
-        TAG,
-        String.format(
-            Locale.US,
-            "findBestModelFile: best model: %s; localePreferences: %s; detectedLocales: %s;"
-                + " targetLocale: %s",
-            modelFile,
-            localePreferences,
-            detectedLocales,
-            targetLocale));
-    return modelFile;
+    return findBestModelFile(modelType, targetLocale);
   }
 
   /**

native/utils/tokenfree/byte_encoder_test.cc

diff --git a/native/utils/tokenfree/byte_encoder_test.cc b/native/utils/tokenfree/byte_encoder_test.cc
index d4d119e..964e316 100644
--- a/native/utils/tokenfree/byte_encoder_test.cc
+++ b/native/utils/tokenfree/byte_encoder_test.cc
@@ -29,7 +29,7 @@
 
 using testing::ElementsAre;
 
-TEST(EncoderTest, SimpleTokenization) {
+TEST(ByteEncoderTest, SimpleTokenization) {
   const ByteEncoder encoder;
   {
     std::vector<int64_t> encoded_text;
@@ -39,7 +39,7 @@
   }
 }
 
-TEST(EncoderTest, SimpleTokenization2) {
+TEST(ByteEncoderTest, SimpleTokenization2) {
   const ByteEncoder encoder;
   {
     std::vector<int64_t> encoded_text;