summaryrefslogtreecommitdiff
path: root/core/java/android/view/ViewRoot.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2011-01-24 13:30:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-24 13:30:37 -0800
commit3873da3c6ee0a63de0d91e6045b7546402f4ce3d (patch)
tree4269dbe697c68614bc642a448bd3b050bb1b8245 /core/java/android/view/ViewRoot.java
parent222b8e256941db75092c6a047a99e33e9e6257d2 (diff)
parent2acb67ec9fe34316231519373f59dfb76c03d57b (diff)
am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
* commit '2acb67ec9fe34316231519373f59dfb76c03d57b': Use optimized display lists for all hwaccelerated rendering
Diffstat (limited to 'core/java/android/view/ViewRoot.java')
-rw-r--r--core/java/android/view/ViewRoot.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index 6bc5e8a9289e..24a9d4298d43 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -602,7 +602,7 @@ public final class ViewRoot extends Handler implements ViewParent,
dirty.inset(-1, -1);
}
}
- if (!mDirty.isEmpty()) {
+ if (!mDirty.isEmpty() && !mDirty.contains(dirty)) {
mAttachInfo.mIgnoreDirtyState = true;
}
mDirty.union(dirty);