Skip to content

Commit 6871671

Browse files
chethaaseAndroid Git Automerger
authored andcommitted
am 6f3e7bb: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
* commit '6f3e7bbf14d43553dfca6a59bbbb1c6ee19a70fc': Fix for previous commit on non-interesecting invalidations
2 parents 08ab69b + 6f3e7bb commit 6871671

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

core/java/android/view/ViewRootImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -890,9 +890,10 @@ public ViewParent invalidateChildInParent(int[] location, Rect dirty) {
890890
// updates that lie outside of the visible region
891891
final float appScale = mAttachInfo.mApplicationScale;
892892
if (localDirty.intersect(0, 0,
893-
(int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f)) &&
894-
!mWillDrawSoon) {
895-
scheduleTraversals();
893+
(int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f))) {
894+
if (!mWillDrawSoon) {
895+
scheduleTraversals();
896+
}
896897
} else {
897898
localDirty.setEmpty();
898899
}

0 commit comments

Comments
 (0)