am bf378fd: Don\'t allow screen invalidations to go outside bounds of screen

mikejurka · Android Git Automerger · commit a7e1d8d5f7d1 · 2012-02-23T08:07:51.000-08:00
* commit 'bf378fd7d7a91085685fe9e5528b84c485041c77':
  Don't allow screen invalidations to go outside bounds of screen
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
@@ -811,6 +811,8 @@ boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callba
             if (canDraw()) {
                 if (!hasDirtyRegions()) {
                     dirty = null;
+                } else if (dirty != null) {
+                    dirty.intersect(0, 0, mWidth, mHeight);
                 }
                 attachInfo.mIgnoreDirtyState = true;
                 attachInfo.mDrawingTime = SystemClock.uptimeMillis();

Original file line number	Diff line number	Diff line change
`@@ -811,6 +811,8 @@ boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callba`
`811`	`811`	`if (canDraw()) {`
`812`	`812`	`if (!hasDirtyRegions()) {`
`813`	`813`	`dirty = null;`
	`814`	`+ } else if (dirty != null) {`
	`815`	`+ dirty.intersect(0, 0, mWidth, mHeight);`
`814`	`816`	`}`
`815`	`817`	`attachInfo.mIgnoreDirtyState = true;`
`816`	`818`	`attachInfo.mDrawingTime = SystemClock.uptimeMillis();`