diff --git a/api/current.txt b/api/current.txt
index 5697b3970851b..01361c2dd3b2f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6625,7 +6625,7 @@ package android.app.assist {
 
   public static class AssistStructure.ViewNode {
     method public float getAlpha();
-    method public java.lang.String[] getAutoFillHints();
+    method public java.lang.String[] getAutofillHints();
     method public android.view.autofill.AutofillId getAutofillId();
     method public java.lang.String[] getAutofillOptions();
     method public int getAutofillType();
diff --git a/api/system-current.txt b/api/system-current.txt
index 0ac579ecf2ad7..171cf2d07851a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6868,7 +6868,7 @@ package android.app.assist {
 
   public static class AssistStructure.ViewNode {
     method public float getAlpha();
-    method public java.lang.String[] getAutoFillHints();
+    method public java.lang.String[] getAutofillHints();
     method public android.view.autofill.AutofillId getAutofillId();
     method public java.lang.String[] getAutofillOptions();
     method public int getAutofillType();
diff --git a/api/test-current.txt b/api/test-current.txt
index 86227a770648d..0c89c558d7e0f 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -6655,7 +6655,7 @@ package android.app.assist {
 
   public static class AssistStructure.ViewNode {
     method public float getAlpha();
-    method public java.lang.String[] getAutoFillHints();
+    method public java.lang.String[] getAutofillHints();
     method public android.view.autofill.AutofillId getAutofillId();
     method public java.lang.String[] getAutofillOptions();
     method public int getAutofillType();
diff --git a/core/java/android/app/assist/AssistStructure.java b/core/java/android/app/assist/AssistStructure.java
index 545aef5224b71..9f911f5c19c30 100644
--- a/core/java/android/app/assist/AssistStructure.java
+++ b/core/java/android/app/assist/AssistStructure.java
@@ -964,6 +964,16 @@ public class AssistStructure implements Parcelable {
          *
          * @return The hints for this view
          */
+        @Nullable public String[] getAutofillHints() {
+            return mAutofillHints;
+        }
+
+        /**
+         * @hide
+         * @deprecated use getAutofillHints() instead.
+         */
+        // TODO(b/33197203): remove once clients don't use it anymore...
+        @Deprecated
         @Nullable public String[] getAutoFillHints() {
             return mAutofillHints;
         }