Merge "Removed deprecated setAutofill() method for virtual children." into oc-dev

am: 25ae29dfd5

Change-Id: If14315daa807243828d0c386638fad38811d99e0

core/java/android/app/assist/AssistStructure.java

@@ -1681,11 +1681,6 @@ public class AssistStructure implements Parcelable {
             return mNode.mChildren != null ? mNode.mChildren.length : 0;
         }
 
-        @Override
-        public void setAutofillId(@NonNull ViewStructure parent, int virtualId) {
-            setAutofillId(parent.getAutofillId(), virtualId);
-        }
-
         @Override
         public ViewStructure newChild(int index) {
             ViewNode node = new ViewNode();

core/java/android/view/ViewStructure.java

@@ -303,13 +303,6 @@ public abstract class ViewStructure {
      */
     public abstract void setAutofillId(@NonNull AutofillId parentId, int virtualId);
 
-    /**
-     * @deprecated - use {@link #setAutofillId(AutofillId, int)} instead
-     * @hide
-     */
-    @Deprecated
-    public abstract void setAutofillId(@NonNull ViewStructure parent, int virtualId);
-
     /**
      * Sets the {@link View#getAutofillType()} that can be used to autofill this node.
      */