From 866ded50bb9ccba3e1245dcb2e7f780a413735c0 Mon Sep 17 00:00:00 2001
From: Phil Weaver <pweaver@google.com>
Date: Tue, 1 Nov 2016 23:38:44 +0000
Subject: [PATCH] Revert "Don't invalidate list data during layout."

This reverts commit 456158ffc29864e02b2f66481fe6b0efcfdacba0.

Change-Id: I7a61dc34dfc81ee650ca0883fe99c0f5dc08ba75
---
 core/java/android/widget/AbsListView.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 2a2c5ee525399..7b45d8cb05b09 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2160,6 +2160,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
         }
 
         layoutChildren();
+        mInLayout = false;
 
         mOverscrollMax = (b - t) / OVERSCROLL_LIMIT_DIVISOR;
 
@@ -2167,7 +2168,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
         if (mFastScroll != null) {
             mFastScroll.onItemCountChanged(getChildCount(), mItemCount);
         }
-        mInLayout = false;
     }
 
     /**
@@ -2697,9 +2697,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
      * fail to relayout them properly to accommodate for new bounds.
      */
     void handleBoundsChange() {
-        if (mInLayout) {
-            return;
-        }
         final int childCount = getChildCount();
         if (childCount > 0) {
             mDataChanged = true;