diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java
index a8d3984adc7e5..043eb348a7062 100644
--- a/core/java/android/widget/EditText.java
+++ b/core/java/android/widget/EditText.java
@@ -140,6 +140,12 @@ public class EditText extends TextView {
         return EditText.class.getName();
     }
 
+    /** @hide */
+    @Override
+    protected boolean supportsAutoSizeText() {
+        return false;
+    }
+
     /** @hide */
     @Override
     public void onInitializeAccessibilityNodeInfoInternal(AccessibilityNodeInfo info) {
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index b85175d655f8a..44655f18f3eb8 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -1534,7 +1534,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
         }
 
         // Setup auto-size.
-        if (mEditor == null) {
+        if (supportsAutoSizeText()) {
             switch (mAutoSizeType) {
                 case AUTO_SIZE_TYPE_NONE:
                     // Nothing to do.
@@ -9261,14 +9261,22 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
     }
 
     /**
-     * @return true if this TextView is specialized for showing and interacting with the extracted
-     * text in a full-screen input method.
+     * @return {@code true} if this TextView is specialized for showing and interacting with the
+     * extracted text in a full-screen input method.
      * @hide
      */
     public boolean isInExtractedMode() {
         return false;
     }
 
+    /**
+     * @return {@code true} if this TextView supports autosizing text to fit within its container.
+     * @hide
+     */
+    protected boolean supportsAutoSizeText() {
+        return true;
+    }
+
     /**
      * This is a temporary method. Future versions may support multi-locale text.
      * Caveat: This method may not return the latest spell checker locale, but this should be