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

Commit 95137857 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev

parents e4c3ff2f 898c7045

core/java/android/widget/AdapterView.java

+8 −6
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { 
        View listItem = view;

        try {

            View v;

            while (!(v = (View) listItem.getParent()).equals(this)) {

            while ((v = (View) listItem.getParent()) != null && !v.equals(this)) {

                listItem = v;

            }

        } catch (ClassCastException e) {
@@ -620,6 +620,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { 
            return INVALID_POSITION;

        }



        if (listItem != null) {

            // Search the children for the list item

            final int childCount = getChildCount();

            for (int i = 0; i < childCount; i++) {
@@ -627,6 +628,7 @@ public abstract class AdapterView<T extends Adapter> extends ViewGroup { 
                    return mFirstPosition + i;

                }

            }

        }



        // Child not found!

        return INVALID_POSITION;