Fix lazy measure logic to not use obsolete values

Issue #10022821 Lazy measure broken

Change-Id: I618ed5e80291304b5430c853d51e70e09f057e4c

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 555e883..299c4a2 100644 (file)
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -15995,7 +15995,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
 
             resolveRtlPropertiesIfNeeded();
 
-            int cacheIndex = mMeasureCache.indexOfKey(key);
+            int cacheIndex = (mPrivateFlags & PFLAG_FORCE_LAYOUT) == PFLAG_FORCE_LAYOUT ? -1 :
+                    mMeasureCache.indexOfKey(key);
             if (cacheIndex < 0) {
                 // measure ourselves, this should set the measured dimension flag back
                 onMeasure(widthMeasureSpec, heightMeasureSpec);