diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-06-07 16:37:22 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-06-07 16:37:22 -0700 |
commit | c1038e778ff9f1efe6334ca71b74df5f720e6970 (patch) | |
tree | 487c97fa19467613b9c6b58d2dd3b4f971469398 /graphics | |
parent | 7ad843d66d3ebb9250f00e836f0e8e9502d7287b (diff) | |
parent | 6af5a9ea4d7efb16c859467389c9e3cb9352eaa6 (diff) | |
download | frameworks_base-c1038e778ff9f1efe6334ca71b74df5f720e6970.zip frameworks_base-c1038e778ff9f1efe6334ca71b74df5f720e6970.tar.gz frameworks_base-c1038e778ff9f1efe6334ca71b74df5f720e6970.tar.bz2 |
merge from open-source master
Change-Id: I1a36964a723bce72139f1bc2402520b7f8d5e47b
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/Canvas.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 345f810..76cde73 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -1221,7 +1221,7 @@ public class Canvas { checkRange(texs.length, texOffset, vertexCount); } if (colors != null) { - checkRange(colors.length, colorOffset, vertexCount); + checkRange(colors.length, colorOffset, vertexCount / 2); } if (indices != null) { checkRange(indices.length, indexOffset, indexCount); |