diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2011-08-31 10:30:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-31 10:30:27 -0700 |
| commit | e7197a996ff9c4a51d32dd2f918aab97d2b191ef (patch) | |
| tree | 06ac32a5070b7df390250633c7826c2f2e1cd6b7 /graphics | |
| parent | 49fb943db85c748fc7dd4f5ee4a461d7489fb1b0 (diff) | |
| parent | 8fa6503feb1954d8c11a0591a567e6acedf7abe9 (diff) | |
| download | frameworks_base-e7197a996ff9c4a51d32dd2f918aab97d2b191ef.zip frameworks_base-e7197a996ff9c4a51d32dd2f918aab97d2b191ef.tar.gz frameworks_base-e7197a996ff9c4a51d32dd2f918aab97d2b191ef.tar.bz2 | |
Merge "Fix bug #5233207 android.graphics.cts.PaintTest#testBreakText fails on IRK56F trygon-userdebug"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/Paint.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index b4d94f3..896f81e 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -1349,7 +1349,7 @@ public class Paint { 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(); } |