summaryrefslogtreecommitdiffstats
path: root/graphics/java/android
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-07 16:45:04 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-07 16:45:04 -0700
commitd994dcbd816d5431dfaa59de7457e28bdfc8f523 (patch)
treebd6540287768fd1c350b3d2dbe5771e7fd51529e /graphics/java/android
parent9258ad7d7865dc854889ef24d274717296a60446 (diff)
parentcefdedc369a1bdf8fb1bf5c58f3de7b0afee0cc4 (diff)
downloadframeworks_base-d994dcbd816d5431dfaa59de7457e28bdfc8f523.zip
frameworks_base-d994dcbd816d5431dfaa59de7457e28bdfc8f523.tar.gz
frameworks_base-d994dcbd816d5431dfaa59de7457e28bdfc8f523.tar.bz2
am cefdedc3: merge from froyo-plus-aosp
Diffstat (limited to 'graphics/java/android')
-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 064fab6..aec977a 100644
--- a/graphics/java/android/graphics/Canvas.java
+++ b/graphics/java/android/graphics/Canvas.java
@@ -1232,7 +1232,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);