8 files changed, 55 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt
index 4a718ae4e77d..c70769419f2d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -48085,7 +48085,8 @@ package android.view.textclassifier {
 
   public final class TextClassificationManager {
     method public java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
-    method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
+    method public android.view.textclassifier.TextClassifier getTextClassifier();
+    method public void setTextClassifier(android.view.textclassifier.TextClassifier);
   }
 
   public final class TextClassificationResult {
diff --git a/api/removed.txt b/api/removed.txt
index fa62e056757c..fefecf512f2a 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -384,6 +384,14 @@ package android.view {
 
 }
 
+package android.view.textclassifier {
+
+  public final class TextClassificationManager {
+    method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
+  }
+
+}
+
 package android.webkit {
 
   public class WebViewClient {
diff --git a/api/system-current.txt b/api/system-current.txt
index 2686058fe491..cc7dce8f93e6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -51575,7 +51575,8 @@ package android.view.textclassifier {
 
   public final class TextClassificationManager {
     method public java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
-    method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
+    method public android.view.textclassifier.TextClassifier getTextClassifier();
+    method public void setTextClassifier(android.view.textclassifier.TextClassifier);
   }
 
   public final class TextClassificationResult {
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 1244103ee62d..e033a848a4c9 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -378,6 +378,14 @@ package android.view {
 
 }
 
+package android.view.textclassifier {
+
+  public final class TextClassificationManager {
+    method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
+  }
+
+}
+
 package android.webkit {
 
   public class WebViewClient {
diff --git a/api/test-current.txt b/api/test-current.txt
index 593a83a5188f..2b539052f12a 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -48468,7 +48468,8 @@ package android.view.textclassifier {
 
   public final class TextClassificationManager {
     method public java.util.List<android.view.textclassifier.TextLanguage> detectLanguages(java.lang.CharSequence);
-    method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
+    method public android.view.textclassifier.TextClassifier getTextClassifier();
+    method public void setTextClassifier(android.view.textclassifier.TextClassifier);
   }
 
   public final class TextClassificationResult {
diff --git a/api/test-removed.txt b/api/test-removed.txt
index fa62e056757c..fefecf512f2a 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -384,6 +384,14 @@ package android.view {
 
 }
 
+package android.view.textclassifier {
+
+  public final class TextClassificationManager {
+    method public android.view.textclassifier.TextClassifier getDefaultTextClassifier();
+  }
+
+}
+
 package android.webkit {
 
   public class WebViewClient {
diff --git a/core/java/android/view/textclassifier/TextClassificationManager.java b/core/java/android/view/textclassifier/TextClassificationManager.java
index 548796584dc8..0b6021ac7d03 100644
--- a/core/java/android/view/textclassifier/TextClassificationManager.java
+++ b/core/java/android/view/textclassifier/TextClassificationManager.java
@@ -17,6 +17,7 @@
 package android.view.textclassifier;
 
 import android.annotation.NonNull;
+import android.annotation.Nullable;
 import android.content.Context;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
@@ -45,7 +46,7 @@ public final class TextClassificationManager {
 
     private final Context mContext;
     private ParcelFileDescriptor mLangIdFd;
-    private TextClassifier mDefault;
+    private TextClassifier mTextClassifier;
     private LangId mLangId;
 
     /** @hide */
@@ -53,15 +54,32 @@ public final class TextClassificationManager {
         mContext = Preconditions.checkNotNull(context);
     }
 
+    // TODO: Remove.
+    /** @removed */
+    public TextClassifier getDefaultTextClassifier() {
+        return getTextClassifier();
+    }
+
     /**
-     * Returns the default text classifier.
+     * Returns the text classifier.
      */
-    public TextClassifier getDefaultTextClassifier() {
+    public TextClassifier getTextClassifier() {
         synchronized (mTextClassifierLock) {
-            if (mDefault == null) {
-                mDefault = new TextClassifierImpl(mContext);
+            if (mTextClassifier == null) {
+                mTextClassifier = new TextClassifierImpl(mContext);
             }
-            return mDefault;
+            return mTextClassifier;
+        }
+    }
+
+    /**
+     * Sets the text classifier.
+     * Set to null to use the system default text classifier.
+     * Set to {@link TextClassifier#NO_OP} to disable text classifier features.
+     */
+    public void setTextClassifier(@Nullable TextClassifier textClassifier) {
+        synchronized (mTextClassifierLock) {
+            mTextClassifier = textClassifier;
         }
     }
 
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 02afee32153b..3d5e81bcae33 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -10765,7 +10765,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
             TextClassificationManager tcm =
                     mContext.getSystemService(TextClassificationManager.class);
             if (tcm != null) {
-                mTextClassifier = tcm.getDefaultTextClassifier();
+                mTextClassifier = tcm.getTextClassifier();
             } else {
                 mTextClassifier = TextClassifier.NO_OP;
             }