diff options
| -rw-r--r-- | core/java/android/view/View.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index ecb391d12bf1..c68b01cac538 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -12028,12 +12028,13 @@ public class View implements Drawable.Callback2, KeyEvent.Callback, Accessibilit mPrivateFlags |= FORCE_LAYOUT; mPrivateFlags |= INVALIDATED; - if (mLayoutParams != null && mParent != null) { - mLayoutParams.resolveWithDirection(getResolvedLayoutDirection()); - } - - if (mParent != null && !mParent.isLayoutRequested()) { - mParent.requestLayout(); + if (mParent != null) { + if (mLayoutParams != null) { + mLayoutParams.resolveWithDirection(getResolvedLayoutDirection()); + } + if (!mParent.isLayoutRequested()) { + mParent.requestLayout(); + } } } |