Don't cache mFirstPosition before a layoutChildren in ListView.onFocusChanged (d7507834) · Commits · e / os / android_frameworks_base

core/java/android/widget/ListView.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -3092,9 +3092,9 @@ public class ListView extends AbsListView {
		previouslyFocusedRect.offset(mScrollX, mScrollY);

		final ListAdapter adapter = mAdapter;
		final int firstPosition = mFirstPosition;
		// Don't cache the result of getChildCount here, it could change in layoutChildren.
		if (adapter.getCount() < getChildCount() + firstPosition) {
		// Don't cache the result of getChildCount or mFirstPosition here,
		// it could change in layoutChildren.
		if (adapter.getCount() < getChildCount() + mFirstPosition) {
		mLayoutMode = LAYOUT_NORMAL;
		layoutChildren();
		}
		@@ -3104,6 +3104,7 @@ public class ListView extends AbsListView {
		Rect otherRect = mTempRect;
		int minDistance = Integer.MAX_VALUE;
		final int childCount = getChildCount();
		final int firstPosition = mFirstPosition;

		for (int i = 0; i < childCount; i++) {
		// only consider selectable views