Use the textclassifier library for smart selection

Test: cts-tradefed run cts-dev -m CtsViewTestCases -t android.view.textclassifier.cts.TextClassificationManagerTest
Bug: 34780447
Change-Id: I090654f266a214cba9346f954e14d8878146e343

diff --git a/core/java/android/view/textclassifier/LangId.java b/core/java/android/view/textclassifier/LangId.java
index ada3c37..23c7842 100644 (file)
--- a/core/java/android/view/textclassifier/LangId.java
+++ b/core/java/android/view/textclassifier/LangId.java
@@ -22,7 +22,7 @@ package android.view.textclassifier;
 final class LangId {
 
     static {
-        System.loadLibrary("smart-selection_jni");
+        System.loadLibrary("textclassifier");
     }
 
     private final long mModelPtr;

diff --git a/core/java/android/view/textclassifier/SmartSelection.java b/core/java/android/view/textclassifier/SmartSelection.java
index c48cd06..9397a41 100644 (file)
--- a/core/java/android/view/textclassifier/SmartSelection.java
+++ b/core/java/android/view/textclassifier/SmartSelection.java
@@ -23,7 +23,7 @@ package android.view.textclassifier;
 final class SmartSelection {
 
     static {
-        System.loadLibrary("smart-selection_jni");
+        System.loadLibrary("textclassifier");
     }
 
     private final long mCtx;
@@ -92,4 +92,3 @@ final class SmartSelection {
         }
     }
 }
-

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index c9f9d6f..5665807 100644 (file)
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -287,6 +287,7 @@ LOCAL_SHARED_LIBRARIES := \
     libhwbinder \
     libvintf \
     libnativewindow \
+    libtextclassifier \
 
 LOCAL_SHARED_LIBRARIES += \
     libhwui \