Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev

1 files changed, 4 insertions, 3 deletions

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index b5a9090de968..67452ec1d19f 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -888,9 +888,10 @@ public final class ViewRootImpl implements ViewParent,
         // updates that lie outside of the visible region
         final float appScale = mAttachInfo.mApplicationScale;
         if (localDirty.intersect(0, 0,
-                (int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f)) &&
-                !mWillDrawSoon) {
-            scheduleTraversals();
+                (int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f))) {
+            if (!mWillDrawSoon) {
+                scheduleTraversals();
+            }
         } else {
             localDirty.setEmpty();
         }