diff options
| author | Chris Craik <ccraik@google.com> | 2015-05-01 21:01:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-01 21:01:14 +0000 |
| commit | 5c705c595d6adbb4b6e8ad5dee29205246cd5cc4 (patch) | |
| tree | 829152c2c5dd85444adfa8c31ad21763f5a63ad7 /core/java/android/view/ViewGroup.java | |
| parent | f4ff8f701f8127ad9e187a30e9407375695a4b62 (diff) | |
| parent | b2847afde24aac22c8fb804cdce0c24b8a7c40c4 (diff) | |
| download | frameworks_base-5c705c595d6adbb4b6e8ad5dee29205246cd5cc4.zip frameworks_base-5c705c595d6adbb4b6e8ad5dee29205246cd5cc4.tar.gz frameworks_base-5c705c595d6adbb4b6e8ad5dee29205246cd5cc4.tar.bz2 | |
Merge "Fix build." into mnc-dev
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index ef57dc3..d0d4201 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3524,9 +3524,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } private void recreateChildDisplayList(View child) { - child.mRecreateDisplayList = (child.mPrivateFlags & PFLAG_INVALIDATED) != 0; + child.mRecreateDisplayList = (child.mPrivateFlags & PFLAG_INVALIDATED) + == PFLAG_INVALIDATED; child.mPrivateFlags &= ~PFLAG_INVALIDATED; - child.updateDisplayListIfDirty(); + child.getDisplayList(); child.mRecreateDisplayList = false; } |