summaryrefslogtreecommitdiff
path: root/core/java/android/view/ViewRoot.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2011-01-24 11:15:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-24 11:15:51 -0800
commit2acb67ec9fe34316231519373f59dfb76c03d57b (patch)
treebd7e912f3ac5c6531a7192584b4f3060d05ae071 /core/java/android/view/ViewRoot.java
parent99b8041cc6bef1983f7a30adf0e2f0a751a18d3a (diff)
parent67005b05cc76a38a5b3bf6e83957dd03619e9126 (diff)
am 67005b05: Merge "Use optimized display lists for all hwaccelerated rendering" into honeycomb
* commit '67005b05cc76a38a5b3bf6e83957dd03619e9126': 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 d9321416ab97..ba671c0b0077 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -597,7 +597,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);