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

Commit b63425e4 authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Fix lazy measure logic to not use obsolete values"

parents 09d20f3b deababcd

core/java/android/view/View.java

+2 −1
Original line number Diff line number Diff line
@@ -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);