From 9911d18f0ebc9a68e41838471de507a04ea8fd9d Mon Sep 17 00:00:00 2001
From: Chet Haase <chet@google.com>
Date: Wed, 17 Oct 2012 14:14:56 -0700
Subject: Fix for previous commit on non-interesecting invalidations

An error in the logic meant that some valid invalidations weren't getting through,
causing Launcher (for one) to get stuck sometimes.

Change-Id: I180622623b19770cd61034a5bd7991a5e2fd0a64
---
 core/java/android/view/ViewRootImpl.java | 7 ++++---
 1 file 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();
         }
-- 
cgit v1.2.3-59-g8ed1b