Commit b890523f authored Aug 28, 2017 by Daichi Hirono

Check LayoutParam before clearing recycled state.

If header view / footer view is added to ListView before setting
adapter, the ListView regards the item count is zero even it has header
/ footer views.

Thus ListView invokes resetList(), and it invokes clearRecycledState() for
header / footer views. But in this method, there is no guarantee the
views has proper layout param.

The CL adds guard to check if the layout param is correct or not. If the
view does not have proepr layout param, it should do nothing because the
view has not been added to the ListView, and the LayoutParam will be
updated when ListView invokes obtainView for the view.

Bug: 65035699
Test: CTS ListViewTest
Change-Id: I4449d4bbcdba8e7cc10ec64d711f937a0f3375ca

parent 6916aad0

core/java/android/widget/ListView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -624,9 +624,9 @@ public class ListView extends AbsListView {

		for (int i = 0; i < count; i++) {
		final View child = infos.get(i).view;
		final LayoutParams p = (LayoutParams) child.getLayoutParams();
		if (p != null) {
		p.recycledHeaderFooter = false;
		final ViewGroup.LayoutParams params = child.getLayoutParams();
		if (checkLayoutParams(params)) {
		((LayoutParams) params).recycledHeaderFooter = false;
		}
		}
		}