summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-02-23 08:09:59 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-23 08:09:59 -0800
commit6ad5d69da5cff2e4b5fb7acdb2699e2315b83307 (patch)
tree069e8a506df00412a02a20d68574fc853f8d70ae
parent8857f669f902acd5f3763ea65b023a0987e6ea0e (diff)
parent0a232673370989f54e05fd2508ce90267a54abd1 (diff)
downloadframeworks_base-6ad5d69da5cff2e4b5fb7acdb2699e2315b83307.zip
frameworks_base-6ad5d69da5cff2e4b5fb7acdb2699e2315b83307.tar.gz
frameworks_base-6ad5d69da5cff2e4b5fb7acdb2699e2315b83307.tar.bz2
am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '0a232673370989f54e05fd2508ce90267a54abd1': Don't allow screen invalidations to go outside bounds of screen
-rw-r--r--core/java/android/view/HardwareRenderer.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
index ccb6489..71f3cf5 100644
--- a/core/java/android/view/HardwareRenderer.java
+++ b/core/java/android/view/HardwareRenderer.java
@@ -811,6 +811,8 @@ public abstract class HardwareRenderer {
if (canDraw()) {
if (!hasDirtyRegions()) {
dirty = null;
+ } else if (dirty != null) {
+ dirty.intersect(0, 0, mWidth, mHeight);
}
attachInfo.mIgnoreDirtyState = true;
attachInfo.mDrawingTime = SystemClock.uptimeMillis();