am 6ad5d69: am 0a23267: am bf378fd: Don\'t allow screen invalidations to go outside bounds of screen

mikejurka · Android Git Automerger · commit b7ee8e2cb427 · 2012-02-23T12:26:16.000-08:00
* commit '6ad5d69da5cff2e4b5fb7acdb2699e2315b83307':
  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
@@ -910,6 +910,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
`@@ -910,6 +910,8 @@ boolean draw(View view, View.AttachInfo attachInfo, HardwareDrawCallbacks callba`
`910`	`910`	`if (canDraw()) {`
`911`	`911`	`if (!hasDirtyRegions()) {`
`912`	`912`	`dirty = null;`
	`913`	`+ } else if (dirty != null) {`
	`914`	`+ dirty.intersect(0, 0, mWidth, mHeight);`
`913`	`915`	`}`
`914`	`916`	`attachInfo.mIgnoreDirtyState = true;`
`915`	`917`	`attachInfo.mDrawingTime = SystemClock.uptimeMillis();`