Merge "Fix bug with display lists and layout." into honeycomb
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 8af2549..aa69aea 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10288,6 +10288,7 @@
         }
 
         mPrivateFlags |= FORCE_LAYOUT;
+        mPrivateFlags |= INVALIDATED;
 
         if (mParent != null && !mParent.isLayoutRequested()) {
             mParent.requestLayout();
@@ -10301,6 +10302,7 @@
      */
     public void forceLayout() {
         mPrivateFlags |= FORCE_LAYOUT;
+        mPrivateFlags |= INVALIDATED;
     }
 
     /**