Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46f5297a authored by Haoran Zhang's avatar Haoran Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix a bug in Helper.addAutofillableIds() that was causing a crash when... 

Merge "Fix a bug in Helper.addAutofillableIds() that was causing a crash when a view had null autofill id." into main
parents 827dae62 90ec3a47

services/autofill/java/com/android/server/autofill/Helper.java

+4 −1
Original line number Diff line number Diff line
@@ -353,7 +353,10 @@ public final class Helper { 
    private static void addAutofillableIds(@NonNull ViewNode node,

            @NonNull ArrayList<AutofillId> ids, boolean autofillableOnly) {

        if (!autofillableOnly || node.getAutofillType() != View.AUTOFILL_TYPE_NONE) {

            ids.add(node.getAutofillId());

            AutofillId id = node.getAutofillId();

            if (id != null) {

                ids.add(id);

            }

        }

        final int size = node.getChildCount();

        for (int i = 0; i < size; i++) {