summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-07 16:42:09 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-07 16:42:09 -0700
commitcefdedc369a1bdf8fb1bf5c58f3de7b0afee0cc4 (patch)
treea8b599911e32232a8d7f94fe4ca607200b7e90b2 /graphics
parent6fa5360e4f61d63f3206e742f573f7073a6db33c (diff)
parentc1038e778ff9f1efe6334ca71b74df5f720e6970 (diff)
downloadframeworks_base-cefdedc369a1bdf8fb1bf5c58f3de7b0afee0cc4.zip
frameworks_base-cefdedc369a1bdf8fb1bf5c58f3de7b0afee0cc4.tar.gz
frameworks_base-cefdedc369a1bdf8fb1bf5c58f3de7b0afee0cc4.tar.bz2
merge from froyo-plus-aosp
Change-Id: I58f1d905b3fa781e4f5827d4d7b9323a4cdcc04e
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Canvas.java2
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);