diff options
| author | Chet Haase <chet@google.com> | 2011-01-27 10:41:26 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-27 10:41:26 -0800 |
| commit | 246bf85aaacbadf4e892270d714efcdb280a3de8 (patch) | |
| tree | 3d37f82be5422d4b92b65a864183294a2616927d /core/java/android/view/ViewGroup.java | |
| parent | eea200a96a561d8eb9e26831aa6aaf7ddf6ad5a5 (diff) | |
| parent | f4ac547f868db7c8a358e1f6e3d8fcebb02dbd49 (diff) | |
Merge "Fix NPE with display lists when view not attached" into honeycomb
Diffstat (limited to 'core/java/android/view/ViewGroup.java')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index 1313b7815095..d0509b20134a 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -2381,7 +2381,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager } else if (layerType == LAYER_TYPE_NONE) { // Delay getting the display list until animation-driven alpha values are // set up and possibly passed on to the view - hasDisplayList = true; + hasDisplayList = child.canHaveDisplayList(); } } } |