4 files changed, 13 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 4fc4bfc76854..8b9fbe11a0cc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6624,7 +6624,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 db3792be653b..43dbb06298a7 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -6869,7 +6869,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 f8a04d237d7c..fa3879814bc8 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -6654,7 +6654,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 545aef5224b7..9f911f5c19c3 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;
         }