diff options
| author | David Kohen <kohen.d@gmail.com> | 2010-08-03 20:31:43 +0300 |
|---|---|---|
| committer | David Kohen <kohen.d@gmail.com> | 2010-08-06 01:40:27 +0300 |
| commit | 84dc652a83ab2ec8ccd0c2d1535da259785b06fb (patch) | |
| tree | dd649538da309b98b296418605858a9c5af6938e | |
| parent | 8bfadf46af9962b2ada8aa0fde5f64611cfe9adc (diff) | |
| download | frameworks_base-84dc652a83ab2ec8ccd0c2d1535da259785b06fb.zip frameworks_base-84dc652a83ab2ec8ccd0c2d1535da259785b06fb.tar.gz frameworks_base-84dc652a83ab2ec8ccd0c2d1535da259785b06fb.tar.bz2 | |
Reshaping integration fixes
| -rw-r--r-- | graphics/java/android/graphics/Canvas.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 2c61f71..d836eea 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1371,8 +1371,8 @@ public class Canvas { /** @hide **/ public void drawText(char[] text, int index, int count, float x, float y, Paint paint,boolean bidi) { - if ((index | count | (index + count) | - (text.length - index - count)) < 0) { + if (((index | count | (index + count)) < 0) || + (text.length - index - count < 0)) { throw new IndexOutOfBoundsException(); } boolean hasBidi=bidiTest(text,index,count); |