Merge "Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug"

Fabrice Di Meglio · Android (Google) Code Review · commit e7197a996ff9 · 2011-08-31T10:30:27.000-07:00
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java
@@ -1349,7 +1349,7 @@ public int breakText(char[] text, int index, int count,
         if (text == null) {
             throw new IllegalArgumentException("text cannot be null");
         }
-        if ((index | count) < 0 || index + count > text.length) {
+        if (index < 0 || text.length - index < Math.abs(count)) {
             throw new ArrayIndexOutOfBoundsException();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1349,7 +1349,7 @@ public int breakText(char[] text, int index, int count,`
`1349`	`1349`	`if (text == null) {`
`1350`	`1350`	`throw new IllegalArgumentException("text cannot be null");`
`1351`	`1351`	`}`
`1352`		`- if ((index \| count) < 0 \|\| index + count > text.length) {`
	`1352`	`+ if (index < 0 \|\| text.length - index < Math.abs(count)) {`
`1353`	`1353`	`throw new ArrayIndexOutOfBoundsException();`
`1354`	`1354`	`}`
`1355`	`1355`